postinit.local should be set executable (was automatically done with

mkdxsinitrd in earlier versions, but is transported via ConfTGZ now)i,
small fixes for local device fileget ...


git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1299 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 17 insertions, 17 deletions

diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index ab28765d..a3311d79 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -49,16 +49,16 @@ if [ -n "$2" ] ; then
   [ "$DEBUGLEVEL" -gt 2 -a "$DEBUGLEVEL" != 8 ] && usleep 10
 else
   echo -e "${error_msg}${e_msg}${error_shell}"
-  /bin/sh
-  echo -n "Reboot now? [y]"
+  /bin/ash
+  echo -n "Reboot now? [y] (nothing happens here at the moment)"
   exec < /dev/console > /dev/console
-  input="y"
-  read input
-  [ -z "$input" -o "$input" = "y" -o "$input" = "Y" ] && {
-    sleep 4
-    [ -f /proc/sysrq-trigger ] || mount -t proc none /proc
-    echo "b" > /proc/sysrq-trigger
-  }
+  #input="y"
+  #read input
+  #[ -z "$input" -o "$input" = "y" -o "$input" = "Y" ] && {
+  #  sleep 4
+  #  [ -f /proc/sysrq-trigger ] || mount -t proc none /proc
+  #  echo "b" > /proc/sysrq-trigger
+  #}
 fi
 }
 #############################################################################
@@ -357,12 +357,12 @@ if [ "x$filepath" != "x" ] ; then
    ;;
    file)
      local ldev=$fileserv
-     echo "Waiting for /dev/$ldev ...."
-     waitfor /dev/$ldev 10000
+     echo "Waiting for /mnt/etc ...."
+     waitfor /mnt/etc 10000
      mkdir /tmp/$ldev
      echo -e "ext2\nreiserfs\nvfat\nxfs" >/etc/filesystems
-     mount /dev/$ldev /tmp/$ldev || error "$init_errlfg"
-     unpack $cfgfile
+     mount -o ro /dev/$ldev /tmp/$ldev || error "$init_errlfg"
+     unpack /tmp/$ldev/$cfgfile
      umount /dev/$ldev
    ;;
    *)
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index e3257bc9..15d88fc9 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -487,7 +487,6 @@ if [ -n "${bldmod}" ] ; then
       ;;
     lbdev)
       # using clients local block device (disk partition is to be specified)
-      echo "B: /dev/$blddev"
       RDEV=/dev/$blddev
       ;;
   esac
@@ -770,9 +769,10 @@ fi
 
 # post init for some distro specific
 postinit
-[ -s /initramfs/postinit.local ] && \
-  mv /initramfs/postinit.local /bin/postinit.local
-[ -x /bin/postinit.local ] && {
+[ -s /initramfs/postinit.local ] && {
+  mv /initramfs/postinit.local /bin/postinit.local;
+  chmod u+x /bin/postinit.local; }
+[ -f /bin/postinit.local ] && {
   [ $DEBUGLEVEL -gt 0 ] && \
     echo "Running postinit.local - if boot stops here, check the script!"
   /bin/postinit.local; }