merged

diff --git a/.hgtags b/.hgtags
index 4e8bc6f..33a87dc 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -17,3 +17,4 @@ b3334bbbc44d6509fa8490ea944cc022ab4f5fab 0.83
 884b473daf2adad0f33bc6555ecbc56b55e7ca1c 0.84
 cd0ee4845b9e2039f31b2ead8c83968a7262248c 0.85
 098c5e7729b7bed3db3de88141c5de30017c9b2e 0.86
+06220dbaac1373cc6dcdddd138b67e44bd8113e5 0.87

diff --git a/debian/changelog b/debian/changelog
index 3959c7b..ad9c8e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-terminalserver (0.87) unstable; urgency=low
+
+  * Merge in linuxrc from grml64, not terminalserver using
+    busybox 1.4.2 (important: 1.5.0 is broken!) should work again.
+
+ -- Michael Prokop <mika@grml.org>  Wed, 28 Mar 2007 12:24:40 +0200
+
 grml-terminalserver (0.86) unstable; urgency=low
 
   * Support gcc-3.4 and crosscompiling on grml64. Adjusted Depends

diff --git a/linuxrc b/linuxrc
index 48b2aa9..86f67af 100755 (executable)
--- a/linuxrc
+++ b/linuxrc
@@ -531,8 +531,9 @@ if [ -n "$NFS" ]; then
     done
   }
   # modules.alias and modules.dep are in place so USE IT :)!
-  modLoad "$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x; done |/static/xargs)"
-
+  find /sys/devices/ -name modalias |/static/xargs -r /static/grep -h pci: |while read i; do
+    modLoad "$i"
+  done
   # loading additional modules
   modLoad sunrpc lockd af_packet nfs
 
@@ -901,15 +902,13 @@ if test -n "$UNIONFS" && /bin/mount -t $UNIONFS_FILETYPE -o noatime${SECURE},dir
  fi
  # We now have unionfs, copy some data from the initial ramdisk first
  cp -a /etc/fstab /etc/auto.mnt /etc/filesystems /etc/mtab /UNIONFS/etc/
-
  # disable resolvconf on the terminalserver client
  if [ -n "$NFS" ] ; then
     rm /UNIONFS/etc/resolv.conf
     cp -a /etc/resolv.conf /UNIONFS/etc
     echo REPORT_ABSENT_SYMLINK=no >> /UNIONFS/etc/default/resolvconf
  fi
-
- for i in bin boot etc sbin var lib opt root usr; do # Move directories to unionfs
+ for i in bin boot etc sbin var opt root usr $EMUL $LIB64 lib ; do # Move directories to unionfs
   if test -d /$i; then
    /bin/mv /$i /$i.old && \
    # /GRML/lib/ld-linux.so.2 --library-path /GRML/lib /GRML/bin/ln -snf /UNIONFS/$i /$i && \