[Hackndev-commit] SF.net SVN: hackndev: [540] linux4palm/initramfs

[<bob...@us...>]

Revision: 540
Author:   bobofdoom
Date:     2006-08-09 05:57:21 -0700 (Wed, 09 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/hackndev/?rev=540&view=rev

Log Message:
-----------
initramfs: Using fakeroot instead of sudo.

Modified Paths:
--------------
    linux4palm/initramfs/Makefile
    linux4palm/initramfs/base/init
    linux4palm/initramfs/busybox.config
Modified: linux4palm/initramfs/Makefile
===================================================================
--- linux4palm/initramfs/Makefile	2006-08-09 11:45:16 UTC (rev 539)
+++ linux4palm/initramfs/Makefile	2006-08-09 12:57:21 UTC (rev 540)
@@ -1,9 +1,8 @@
 #
 # Builds a Hack&Dev initramfs tree
 #
-# Unfortunately AFAICT we need to use sudo for dealing with the device
-# nodes.
-#
+# Call this from within a fakeroot session.
+# 
 
 OUTDIR?=build
 
@@ -11,6 +10,9 @@
 BBTAR?=${BBSRC}.tar.bz2
 BBURL?="http://www.busybox.net/downloads/${BBTAR}"
 
+# only use this option if fakeroot is not available.
+SUDO?=
+
 all: ${OUTDIR}/bin/busybox ${OUTDIR}/dev/ chown
 
 ${BBTAR}:
@@ -31,17 +33,17 @@
 	mkdir -p ${OUTDIR}/newroot ${OUTDIR}/proc ${OUTDIR}/root
 	mkdir -p ${OUTDIR}/sys ${OUTDIR}/tmp
 	
-${OUTDIR}/dev/: ${OUTDIR} device-nodes.tar.gz
-	sudo tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/
+${OUTDIR}/dev/: ${OUTDIR}/ device-nodes.tar.gz
+	${SUDO} tar -zxpf device-nodes.tar.gz -C ${OUTDIR}/
 
 ${OUTDIR}/bin/busybox: ${BBSRC}/ ${OURDIR}/ busybox.config
 	cp busybox.config ${BBSRC}/.config
 	make -C ${BBSRC}
-	make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR}
+	${SUDO} make -C ${BBSRC} install PREFIX=`pwd`/${OUTDIR}
 
 chown: ${OUTDIR}/ ${OUTDIR}/bin/busybox
-	sudo chown -R 0:0 ${OUTDIR}/
+	${SUDO} chown -R 0:0 ${OUTDIR}/
 
 clean:
-	sudo rm -Rf ${OUTDIR}
+	${SUDO} rm -Rf ${OUTDIR}
 	rm -Rf ${BBSRC}

Modified: linux4palm/initramfs/base/init
===================================================================
--- linux4palm/initramfs/base/init	2006-08-09 11:45:16 UTC (rev 539)
+++ linux4palm/initramfs/base/init	2006-08-09 12:57:21 UTC (rev 540)
@@ -18,9 +18,14 @@
 MODULES_DIR="/lib/modules"
 POST_MODULES_SCRIPT=""
 
+# LifeDrive-specific options
+HDD_DEV=/dev/hda
+HDD_OFFSET=91814912
+LOOP_DEV=/dev/loop0
+
+
 echo initram init started
 
-
 if [ -f /etc/modules.initrd ]; then
   echo loading initial modules
   cat /etc/modules.initrd | while read module; do
@@ -37,6 +42,13 @@
 #mount -n -t proc /proc
 mount -n -t proc none /proc >/dev/null  2>&1 || mount -t proc none /proc
 
+if grep -q /proc/cpuinfo LifeDrive; thena
+	echo Mounting LifeDrive data partition...
+	losetup -o $HDD_OFFSET $LOOP_DEV $HDD_DEV
+	FILES_DEV=$LOOP_DEV
+	FILES_MNT=/mnt/hda
+fi
+
 if [ -b $FILES_DEV ]; then 
   echo -n "linux.boot.cfg on $FILES_DEV: "
   /bin/mount -n -t vfat -o rw $FILES_DEV $FILES_MNT
@@ -58,7 +70,7 @@
     echo not found.
   fi
 else
-  echo fat16 partition not found.
+  echo fat32 partition not found.
 fi
 
 

Modified: linux4palm/initramfs/busybox.config
===================================================================
--- linux4palm/initramfs/busybox.config	2006-08-09 11:45:16 UTC (rev 539)
+++ linux4palm/initramfs/busybox.config	2006-08-09 12:57:21 UTC (rev 540)
@@ -580,11 +580,11 @@
 #
 # Shells
 #
-# CONFIG_FEATURE_SH_IS_ASH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_LASH is not set
 # CONFIG_FEATURE_SH_IS_MSH is not set
-CONFIG_FEATURE_SH_IS_NONE=y
+# CONFIG_FEATURE_SH_IS_NONE is not set
 CONFIG_ASH=y
 
 #


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.