[Devil-linux-commit] build/scripts util-linux, 1.39, 1.40 busybox, 1.31, 1.32

[Serge L. <sma...@us...>]

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

Modified Files:
	util-linux busybox 
Log Message:

- trying to use busybox's mount/umount/losetup


Index: busybox
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/busybox,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- busybox	22 May 2007 15:17:38 -0000	1.31
+++ busybox	15 Sep 2007 17:05:56 -0000	1.32
@@ -47,6 +47,10 @@
 		ln -sf busybox $INITRDDIR/bin/mdev || exit 1
 		ln -sf busybox $INITRDDIR/bin/chroot || exit 1
 		ln -sf busybox $INITRDDIR/bin/pivot_root || exit 1
+		ln -sf busybox $INITRDDIR/bin/mount || exit 1
+		ln -sf busybox $INITRDDIR/bin/umount || exit 1
+		ln -sf busybox $INITRDDIR/bin/losetup || exit 1
+
 		;;
 
 	* )

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- util-linux	31 Jul 2007 15:57:10 -0000	1.39
+++ util-linux	15 Sep 2007 17:05:56 -0000	1.40
@@ -43,15 +43,16 @@
 	#for libradius-linux compilation
 	cp ./libmd5.a /usr/local/lib/ || exit 1
 	cd ..
-		
-	cd mount || exit 1
-	make clean
-	make LDFLAGS="-static" all || exit 1
-	cp losetup losetup-static || exit 1
-	cp mount mount-static || exit 1
-	cp umount umount-static  || exit 1
-	make clean
-	cd .. || exit 1
+	
+	### We will use busybox for initrd	
+	# cd mount || exit 1
+	# make clean
+	# make LDFLAGS="-static" all || exit 1
+	# cp losetup losetup-static || exit 1
+	# cp mount mount-static || exit 1
+	# cp umount umount-static  || exit 1
+	# make clean
+	# cd .. || exit 1
 		
 	make $PMAKE LDFLAGS="-pie" || exit 1
 	strip_debug
@@ -76,9 +77,10 @@
 	echo "DISABLE_SCREEN_BLANKING=no" >> $CONFIGFILE
 	echo >> $CONFIGFILE
 		
-	cp -v mount/mount-static $INITRDDIR/bin/mount || exit 1
-	cp -v mount/umount-static $INITRDDIR/bin/umount || exit 1
-	cp -v mount/losetup-static $INITRDDIR/bin/losetup || exit 1
+	### We will use busybox for initrd	
+	# cp -v mount/mount-static $INITRDDIR/bin/mount || exit 1
+	# cp -v mount/umount-static $INITRDDIR/bin/umount || exit 1
+	# cp -v mount/losetup-static $INITRDDIR/bin/losetup || exit 1
 		
     	;;