From 6784da20db046a83119d50885e0151cbe6cf5925 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Thu, 23 Mar 2006 23:43:32 +0000
Subject: adding id 83 partitions to fstab, changes for temp directory

git-svn-id: http://svn.openslx.org/svn/openslx/ld4@123 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/initrd-stuff/bin/hwautocfg  |  9 ++++++++-
 initrd/initrd-stuff/bin/servconfig | 21 ++++++++-------------
 initrd/initrd-stuff/init           |  2 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

(limited to 'initrd')

diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index b0c75dfd..8a4c5a9e 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -434,7 +434,14 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \
     echo -e "$hdpartnr\t/tmp\t\text2\t\tdefaults\t 0 0" >> /mnt/etc/fstab
     part44=yes
     break
-  done      
+  done
+  # put detected linux partitions into /etc/fstab with "noauto"
+  for hdpartnr in $(cat /tmp/hd_part | \
+        sed -n -e "/ 83 /p"|sed -e "s/[[:space:]].*//") ; do
+    mkdir -p /mnt/media/${hdpartnr#/dev/*} 2>/dev/null
+    echo -e "$hdpartnr\t/media/${hdpartnr#/dev/*}\tauto\t\tnoauto,\
+noexec\t 0 0" >> /mnt/etc/fstab
+  done 
 done
 # determine if tmp preparation should wait for format/mount or not
 [ -z "$part44" ] && echo "finished" > /tmp/tmpready
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index fc8ea483..8c8172a8 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -211,11 +211,7 @@ if [ "x$start_x" != "xno" ] ; then
            /etc/X11/xdm \
            /etc/X11/sessions \
            /var/X11R6/bin \
-           /var/run/xdmctl \
-           /tmp/.ICE-unix \
-           /tmp/.X11-unix; do testmkd /mnt/$i; done
-  chmod a+rwxt /mnt/tmp/.ICE-unix 
-  chmod a+rwxt /mnt/tmp/.X11-unix
+           /var/run/xdmctl; do testmkd /mnt/$i; done
   echo "" > /mnt/etc/X11/xdm/Xservers
   # define additional sessions offered to the user (via dhcp/ldap config)
   # descsession -> deprecated by new vmware integration concept
@@ -340,14 +336,13 @@ config_nscd
 
 #######################################################################
 # preparation of /tmp directory (partition 44, nfs scratch, ramdisk)
-# waitfor /tmp/tmpready
-
-# the following should be moved here from X11 ...
-#           /tmp/.ICE-unix \
-#           /tmp/.X11-unix; do testmkd /mnt/$i; done
-#             chmod a+rwxt /mnt/tmp/.ICE-unix
-#               chmod a+rwxt /mnt/tmp/.X11-unix
-               
+waitfor /tmp/tmpready 10000
+# create some directories and correct permissions
+for i in \
+  /tmp/.ICE-unix \
+  /tmp/.X11-unix; do testmkd /mnt/$i; done
+chmod a+rwxt /mnt/tmp/.ICE-unix
+chmod a+rwxt /mnt/tmp/.X11-unix
 
 # servconfig finished successfully
 echo "finished" > /tmp/svcfg
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 38576137..4431ece3 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -96,7 +96,7 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     # if ld.so.cache should not be generated
     noldsc)
       NOLDSC=yes;;
-    # additional source to union root filesystem with
+    # additional source to unify root filesystem with
     union*)
       UNIONFS=1
       UNIONDIRS=${opts#union=};;
-- 
cgit v1.2.3-55-g7522