aufs, squashfs modules for stage3.1 if needed

1 files changed, 32 insertions, 28 deletions

diff --git a/remote/tools/base/base.build b/remote/tools/base/base.build
index 5b1d395b..fb7b7294 100644
--- a/remote/tools/base/base.build
+++ b/remote/tools/base/base.build
@@ -8,68 +8,72 @@ fetch_source() {
 
 build() {
 
-	BUILDDIR=$TOOL_DIR/$TOOL/build
-        [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR 
+	BUILDDIR=${TOOL_DIR}/${TOOL}/build
+        [ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR}
 
 	FILELIST="list_binaries_and_files"
-	[ -e $FILELIST ] && rm $FILELIST
+	[ -e ${FILELIST} ] && rm ${FILELIST}
 
-	for BIN in $REQUIRED_BINARIES
+	for BIN in ${REQUIRED_BINARIES}
 	do
-		echo $(which $BIN) >> $FILELIST
+		echo $(which ${BIN}) >> ${FILELIST}
 	done
 
-	for LIB in $REQUIRED_LIBRARIES
+	for LIB in ${REQUIRED_LIBRARIES}
 	do
-		for LIB_LOCATION in $(locate $LIB|grep ^/lib/)
+		for LIB_LOCATION in $(locate ${LIB}|grep ^/lib/)
 		do
-			echo $LIB_LOCATION >> $FILELIST
+			echo ${LIB_LOCATION} >> ${FILELIST}
 		done
 	done
 
-	for FILE in $REQUIRED_DIRECTORIES
+	for FILE in ${REQUIRED_DIRECTORIES}
 	do
-		[ ! -f $FILE ] && echo $FILE >> $FILELIST
+		[ ! -f ${FILE} ] && echo ${FILE} >> ${FILELIST}
 	done
-	for FILE in $REQUIRED_FILES
+	for FILE in ${REQUIRED_FILES}
 	do
-		[ ! -d $FILE ] && echo $FILE >> $FILELIST
+		[ ! -d ${FILE} ] && echo ${FILE} >> ${FILELIST}
 	done
 
-	# copy needed files from libc6
-	#for FILE in $(dpkg -L libc6|grep -v share/man)
-	#do
-	#	[ ! -d $FILE ] && echo $FILE >> $FILELIST
-	#done
-
-	tar -cpv $(cat $FILELIST) | tar -xpv -C $BUILDDIR &>/dev/null
+	tar -cpv $(cat ${FILELIST}) | tar -xpv -C ${BUILDDIR} &>/dev/null
 }
 
 post_copy() {
 	
 	# make basic directory structure
-	mkdir -p $INIT_DIR/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm}
+	mkdir -p ${INIT_DIR}/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm}
 
 	# copy devices from running system
 	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \
-		$INIT_DIR/dev
+		${INIT_DIR}/dev
 
 	# set /etc/environment to include /openslx/bin and /openslx/sbin
 	echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin\"" \
-        	> $INIT_DIR/etc/environment	
+        	> ${INIT_DIR}/etc/environment	
+
+	# copy static bash profile
+	cp ${TOOL_DIR}/${TOOL}/data/profile ${INIT_DIR}/etc
 
 	# copy pam modules, TODO: better way to find arch-dependant interfix...
-        tar -cpv $(dirname $(locate pam_unix.so|grep ^/lib/)) | tar -xpv -C $INIT_DIR &>/dev/null
+        tar -cpv $(dirname $(locate pam_unix.so|grep ^/lib/)) | tar -xpv -C ${INIT_DIR} &>/dev/null
 
 	# quick fix for /etc/fstab
-	echo "# no configuration" >> $INIT_DIR/etc/fstab
+	echo "# no configuration" >> ${INIT_DIR}/etc/fstab
 
 	# link /etc/mtab, needed for systemd
-	ln -s /proc/self/mounts $INIT_DIR/etc/mtab	
+	ln -s /proc/self/mounts ${INIT_DIR}/etc/mtab	
 
 	# quick fix for missing group in /etc/group
-	echo "lock:x:128:" >> $INIT_DIR/etc/group
+	echo "lock:x:128:" >> ${INIT_DIR}/etc/group
+
+	# setup root account
+	sed -i "s/root:.*/root:\$6\$QGcBjw6e\$sJvGXBfKuNd4Cx5\.aVxJT7PCq\/AWrP\/JLgvDHBGN164Rp2HRIENPQzieO\/2ctlQS7yRgWwaWTqJkZr7Uq37af1:15657:0:99999:7:::/g" ${INIT_DIR}/etc/shadow
+	[ ! -d ${INIT_DIR}/root ] && mkdir ${INIT_DIR}/root
+
+	echo "minibox" > ${INIT_DIR}/etc/hostname
 
-	# set root password
-	sed -i "s/root:.*/root:\$6\$QGcBjw6e\$sJvGXBfKuNd4Cx5\.aVxJT7PCq\/AWrP\/JLgvDHBGN164Rp2HRIENPQzieO\/2ctlQS7yRgWwaWTqJkZr7Uq37af1:15657:0:99999:7:::/g" $INIT_DIR/etc/shadow
+	# copy kernel modules
+	#[ ! -d ${INIT_DIR}/lib/modules/$(uname -r) ] && mkdir -p ${INIT_DIR}/lib/modules/$(uname -r)
+	#cp -r /lib/modules/$(uname -r) ${INIT_DIR}/lib/modules/$(uname -r)
 }