[Devil-linux-commit] build/scripts/scripts pre_init,1.30,1.31

[Bruce S. <bl...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6499/scripts/scripts

Modified Files:
	pre_init 
Log Message:
updated aufs to 2008-05-26


Index: pre_init
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/pre_init,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- pre_init	18 Apr 2008 12:47:07 -0000	1.30
+++ pre_init	30 May 2008 13:11:56 -0000	1.31
@@ -11,14 +11,18 @@
 # used to initialize the devfs
 #
 
-# mount /etc/ as a union/aufs directory
 mount -n -t proc proc /proc # aufs needs /proc/mounts
 mount -n --bind /shm/dev/ /dev/ # aufs needs /dev/null
 mkdir -p /shm/var/tmp # aufs needs /tmp
 
-# select either aufs or unionfs mount below:
-mount -n -t aufs -o br:/shm/etc-mods:/etc-cd=rr none /shm/etc
-#mount -n -t unionfs -o dirs=/shm/etc-mods:/etc-cd=ro none /shm/etc
+# If aufs module exists, use aufs for /etc, otherwise use unionfs
+if [ -r /lib/modules/$(uname -r)/kernel/fs/aufs/aufs.ko ]; then
+	echo "Using AUFS for /etc/"
+	mount -n -t aufs -o br:/shm/etc-mods:/etc-cd=rr none /shm/etc
+else
+	echo "Using UnionFS for /etc/"
+	mount -n -t unionfs -o dirs=/shm/etc-mods:/etc-cd=ro none /shm/etc
+fi
 
 umount -n /proc