From b06ea99a5a1c4233ae9110492a16fa3cc793b74c Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 27 Aug 2009 10:52:22 +0000
Subject: Minor fixes, cosmetical changes (tested).

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3136 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/stage3-stuff/bin/hwautocfg |  4 ++--
 initramfs/stage3-stuff/etc/functions | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg
index df1552d5..0bfbdd2c 100755
--- a/initramfs/stage3-stuff/bin/hwautocfg
+++ b/initramfs/stage3-stuff/bin/hwautocfg
@@ -163,8 +163,8 @@ noexec\t 0 0" >>/tmp/fstab
             mount -t auto ${hdpartnr} /mnt/media/${hdpartnr#/dev/*} \n\
             test -d /mnt/media/${hdpartnr#/dev/*}/home && \
               ln -sf /media/${hdpartnr#/dev/*} /mnt/var/home" >>/etc/do_mnt
-          echo -e "${hdpartnr}\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto,\
-\t 0 0" >>/tmp/fstab
+          echo -e "${hdpartnr}\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto\
+\t\t 0 0" >>/tmp/fstab
         fi
       done
     done
diff --git a/initramfs/stage3-stuff/etc/functions b/initramfs/stage3-stuff/etc/functions
index 8f6a57d2..4788a72b 100644
--- a/initramfs/stage3-stuff/etc/functions
+++ b/initramfs/stage3-stuff/etc/functions
@@ -159,12 +159,12 @@ case "${proto}" in
     done
   ;;
   smb|cifs)
-    # for some reason cifs mounts cannot be pivoted :(
-    #mount -n -o ${mntopt},user=guest,guest,file_mode=0755,dir_mode=0755 \
-    #  -t ${proto} //${server}${srcpath} ${target}
-    d_mkrlscript entry boot.slx "/opt/openslx/uclib-rootfs/bin/mount -n \
--o ${mntopt},guest,user=guest,file_mode=0755,dir_mode=0755 -t ${proto} \
-//${server}${srcpath} ${target#/mnt}"
+    # cifs mounts might be problematic if accessed with superuser id
+    mount -n -o ${mntopt},user=guest,guest,file_mode=0755,dir_mode=0755 \
+      -t ${proto} //${server}${srcpath} ${target}
+    #d_mkrlscript entry boot.slx "/opt/openslx/uclib-rootfs/bin/mount -n \
+    #-o ${mntopt},guest,user=guest,file_mode=0755,dir_mode=0755 -t ${proto} \
+    #//${server}${srcpath} ${target#/mnt}"
   ;;
 esac
 }
@@ -535,9 +535,9 @@ sed '/^[a-zA-Z0-9]*:[a-zA-Z0-9]*:[1-9][0-9]\{3,4\}:/d;/^+:*/d;/^+$/d;
   /^[a-zA-Z0-9]*:[a-zA-Z0-9]*:[5-9][0-9]\{2\}:/d' /mnt/etc/passwd \
   >/tmp/newpasswd
 # and add user nobody again (is there a more elegant way?)
-sed -n -e '/nobody/p' /mnt/etc/passwd >> /tmp/newpasswd
+sed -n -e '/nobody/p' /mnt/etc/passwd >>/tmp/newpasswd
 # create the shadow from passwd file
-echo -e "root:"${root_pw}":12958:0:10000::::" > /mnt/etc/shadow
+echo -e "root:"${root_pw}":12958:0:10000::::" >/mnt/etc/shadow
 sed 's/:.*/:!:13078:0:99999:7:::/;/^root.*/d' /tmp/newpasswd \
   >>/mnt/etc/shadow
 mv /tmp/newpasswd /mnt/etc/passwd
-- 
cgit v1.2.3-55-g7522