Changeset 312

Timestamp:

Mar 13, 2007 5:19:19 PM (6 years ago)

Author:

jrollins

Message:

debirf: removed all "stage" stuff. checked for /proc in etc/fstab.

Location:

trunk/debirf

Files:

• make-debirf (modified) (6 diffs)
• plugins/install-kernel (modified) (1 diff)

trunk/debirf/make-debirf

@@ -44 +44 @@
     mkdir -p "$DEBIRF_ROOT"
     /usr/sbin/debootstrap --exclude=aptitude --include=initramfs-tools "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
-    
-    > .stage/0
 }
 
@@ -54 +52 @@
     done
     run-parts --verbose "$DEBIRF_PLUGINS"
-    
-    > .stage/1
 }
 
@@ -65 +61 @@
     msg "creating debirf initrd..."
     ( cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) > "${DEBIRF_LABEL}_${DEBIRF_DISTRO}_${DEBIRF_".cgz
-    > .stage/4
 }
 
@@ -90 +85 @@
     cp extra/boot/"$INITRD" debirf.cgz
     (cd "$DEBIRF_ROOT" && find * | cpio -H newc --create  | gzip ) >> debirf.cgz
-    > .stage/4
 }
 
@@ -96 +90 @@
 ##### MAIN #####
 
-# create checkpoint directory.  stages:
-# 0: debootstrap creation
-# 1: plugins
-# 2: install kernel and extract kernel/initrd
-# 3: prune
-# 4: initrd method
-mkdir -p .stage
-
 ##### create debootstrap root
-if [ -f .stage/0 ] ; then
-    msg "it looks like a root already exists at $DEBIRF_ROOT."
+if [ -d "$DEBIRF_ROOT" ] ; then
+    echo "directory $DEBIRF_ROOT already exists."
     read -p "write over? [y|N]: " -n 1 OK ; [ -z $OK ] || echo
     if [ "${OK/y/Y}" = 'Y' ] ; then
@@ -151 +137 @@
 > "$DEBIRF_ROOT/etc/mtab"
 # add proc to fstab
-echo proc /proc proc defaults 0 0 >> "$DEBIRF_ROOT/etc/fstab"
-    
-> .stage/3
+if ! grep '/proc' root/etc/fstab | grep -q -v "^[:space:]*#" ; then
+    echo proc /proc proc defaults 0 0 >> "$DEBIRF_ROOT/etc/fstab"
+fi
 
 create_initrd_${DEBIRF_METHOD}

trunk/debirf/plugins/install-kernel

@@ -33 +33 @@
     [ -f "$KERNEL" ] && mv "$KERNEL" extras/boot/$(basename "$KERNEL")
     [ -f "$INITRD" ] && mv "$INITRD" extras/boot/$(basename "$INITRD")
-    
-    > .stage/2
 }
-
 
 ##### install kernel