Changeset 555

Timestamp:

10/23/09 20:47:05 (2 years ago)

Author:

tschmitt

Message:

• Paket:
  • Symlink zur obsoleten Datei /usr/sbin/repack-cloop entfernt.
  • Windows-7-Registry-Patch-Beispieldatei hinzugefügt.
• Linbofs:
  • linbo_cmd.sh: o start(): APPEND-Variable für Windows 7 gefixt.
  • patch_registry.sh: o Handling der Gross-/Kleinschreibung von Registrypfaden gefixt. o Mehrere Fixes bzgl. Windows 7 Unterstützung.

Location:

main/linuxmuster-linbo/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• debian/links (modified) (1 diff)
• examples/win7.reg (added)
• linbo/linbo_cmd.sh (modified) (1 diff)
• linbo/patch_registry.sh (modified) (8 diffs)

main/linuxmuster-linbo/branches/testing/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.99.11-0) unstable; urgency=low
+
+  * package:
+    - removed stale symlink to obsolete /usr/sbin/repack-cloop.
+    - added Windows 7 registry patch example file.
+  * linbofs:
+    - linbo_cmd.sh:
+      o start(): fixed APPEND variable for Windows 7's bootmgr.
+    - patch_registry.sh:
+      o fixed matching cases in key paths.
+      o more fixes according to Windows 7 registry.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Fri, 23 Oct 2009 19:38:43 +0200
+
 linuxmuster-linbo (1.99.10-0) unstable; urgency=low
 

main/linuxmuster-linbo/branches/testing/debian/links

@@ -4 +4 @@
 usr/lib/linuxmuster-linbo/gpxe.krn      var/linbo/gpxe.krn
 usr/share/doc/linuxmuster-linbo/examples        var/linbo/examples
-usr/share/linuxmuster-linbo/repack-cloop.sh usr/sbin/repack-cloop
 usr/share/linuxmuster-linbo/update-linbofs.sh usr/sbin/update-linbofs
 usr/share/linuxmuster-linbo/make-linbo-media.sh usr/sbin/make-linbo-media

main/linuxmuster-linbo/branches/testing/linbo/linbo_cmd.sh

@@ -575 +575 @@
   esac
   # provide a menu.lst for grldr on win2k/xp
-  if [ -e /mnt/[Nn][Tt][Ll][Dd][Rr] ]; then
+  if [ -e /mnt/[Bb][Oo][Oo][Tt][Mm][Gg][Rr] ]; then
+   mkgrldr "$1" "/bootmgr"
+   APPEND="$(echo $APPEND | sed -e 's/ntldr/bootmgr/')"
+  elif [ -e /mnt/[Nn][Tt][Ll][Dd][Rr] ]; then
    mkgrldr "$1" "/ntldr"
-  elif [ -e /mnt/[Bb][Oo][Oo][Tt][Mm][Gg][Rr] ]; then
-   mkgrldr "$1" "/bootmgr"
   elif [ -e /mnt/[Ii][Oo].[Ss][Yy][Ss] ]; then
    # tschmitt: patch autoexec.bat (win98),

main/linuxmuster-linbo/branches/testing/linbo/patch_registry.sh

@@ -7 +7 @@
 #
 # Thomas Schmitt <schmitt@lmz-bw.de>
-# 20.04.2009
+# 23.10.2009
 #
 
@@ -50 +50 @@
 }
 
+# test_key basepath key (returns case sensitive key name or nothing)
 test_key() {
+ local cmd=""
+ if [ -n "$1" ]; then
+  cmd="cd $1\nls\nq\ny\n"
+ else
+  cmd="ls\nq\ny\n"
+ fi
+ echo -e "$cmd" | chntpw -e "$hive" | grep -i "\<$2\>" | awk -F\< '{ print $2 }' | awk -F\> '{ print $1 }'
+}
+
+create_keypath() {
  local key="$1"
- local RC=1
- echo -e "cd $key\nq\ny\n" | chntpw -e "$hive" | grep -q "not found\!" || RC="0"
- return $RC
-}
-
-create_key() {
- local fpath="$1"
  local tpath=""
  local bpath=""
@@ -64 +68 @@
  local i=""
  local OIFS="$IFS"
- IFS="\\"
- for i in $fpath; do
-  bpath="$tpath"
-  if [ -n "$tpath" ]; then tpath="${tpath}\\${i}"; else tpath="$i"; fi
-  if ! test_key "$tpath"; then
-   if [ "$bpath" = "" ]; then
-    cmd="nk ${i}\nq\ny\n"
-   else
-    cmd="cd ${bpath}\nnk ${i}\nq\ny\n"
-   fi
-   exec_command "$cmd"
-  fi
- done
- IFS="$OIFS"
-}
-
-create_keypath() {
- local key="$1"
- local ctrlset="$2"
 
  #####
@@ -95 +80 @@
  [ -n "$DEBUG" ] && echo " 6 fullpath=$fullpath" | tee -a $logfile
 
-        # tschmitt: check if currentkey exists in registry, if not create it
-        if ! test_key "$fullpath"; then
-#  if [ -n "$ctrlset" ]; then
-#   # don't create new keys in supplemental controlsets
-#   [ -n "$DEBUG" ] && echo "### Skipping $fullpath" | tee -a $logfile
-#   return 1
-#  fi
-         [ -n "$DEBUG" ] && echo "### Creating key $fullpath" | tee -a $logfile
-         create_key "$fullpath"
-        fi
-}
-
-# returns success if old value is equal to new value
-test_value(){
- local fpath="$1"
- local newval="$2"
- local curval="$(echo -e "cat ${fpath}\nq\ny\n" | chntpw -e "$hive" | grep -Fi "$newval")"
- if [ -n "$curval" ]; then
-  [ -n "$DEBUG" ] && echo "### $parameter is already set to $curval. Skipping." | tee -a $logfile
-  return 0
- else
-  [ -n "$DEBUG" ] && echo "### $parameter is not equal to $newval. Patching." | tee -a $logfile
-  return 1
- fi
+ # iterate over path chunks and create keys if necessary
+ IFS="\\"
+ for i in $fullpath; do
+  # get case sensitive key name from registry
+  tpath="$(test_key "$bpath" "$i")"
+  # create the key if test_key returns an empty key name
+  if [ -z "$tpath" ]; then
+   [ -n "$DEBUG" ] && echo "### Creating new key $bpath $i" | tee -a $logfile
+   tpath="$i"
+   cmd="cd ${bpath}\nnk ${tpath}\nq\ny\n"
+   exec_command "$cmd"
+  fi
+  if [ -n "$bpath" ]; then
+   bpath="${bpath}\\${tpath}"
+  else
+   bpath="$tpath"
+  fi
+ done
+ IFS="$OIFS"
+ fullpath="$bpath"
 }
 
@@ -128 +109 @@
  [ "${change// /}" = "" ] && return 1
 
- local command="cd ${fullpath}\n"
+ command="cd ${fullpath}\n"
  [ -n "$DEBUG" ] && echo " 8 command=$command" | tee -a $logfile
 
@@ -159 +140 @@
  fi
 
- # return if value is already set -> nothing to do
-# if [ -n "$value" ]; then
-#  test_value "${fullpath}\\${parameter}" "$value" && return 1
-# fi
-
  local basecommand="${command}"
 
- # delete value
- command="${basecommand}dv ${parameter}\nq\ny\n"
- exec_command "$command"
- [ -n "$DEBUG" ] && echo "16 command=$command" | tee -a $logfile
-
- # create value
- command="${basecommand}nv ${type} ${parameter}\nq\ny\n"
- exec_command "$command"
- [ -n "$DEBUG" ] && echo "17 command=$command" | tee -a $logfile
+ # get real case sensitive parameter name from registry
+ local tpara=""
+ tpara="$(test_key "$fullpath" "$parameter")"
+
+ # create parameter if not found or set parameter name to case sensitive name found in registry
+ if [ -z "$tpara" ]; then
+  command="${basecommand}nv ${type} ${parameter}\nq\ny\n"
+  exec_command "$command"
+  [ -n "$DEBUG" ] && echo "16 command=$command" | tee -a $logfile
+ else
+  parameter="$tpara"
+ fi
 
  # edit value
  command="${basecommand}ed ${parameter}\n$value\nq\ny\n"
  exec_command "$command"
- [ -n "$DEBUG" ] && echo "18 command=$command" | tee -a $logfile
+ [ -n "$DEBUG" ] && echo "17 command=$command" | tee -a $logfile
 }
 
@@ -218 +197 @@
     create_command || break
 
-          # tschmitt: patch other controlsets up to 3
+           # tschmitt: patch other controlsets up to 3
     case "$command" in
      *ControlSet001*)
@@ -225 +204 @@
                             ctrlset="ControlSet00$n"
                             [ -n "$DEBUG" ] && echo "### Checking $ctrlset ..." | tee -a $logfile
-                            if test_key "$ctrlset"; then
-                             key_new="$(echo "$key" | sed "s,ControlSet001,$ctrlset,")"
+                            if [ -n "$(test_key "" "$ctrlset")" ]; then
+                             key_new="$(echo "$key" | sed "s,ControlSet00[1-9],$ctrlset,")"
                                     [ -n "$DEBUG" ] && echo "### Patching $ctrlset with new key: $key_new" | tee -a $logfile
-                                    create_keypath "$key_new" "$ctrlset" && create_command
+                                    create_keypath "$key_new" && create_command
                             fi
                             let n+=1