Changeset 720

Timestamp:

Nov 21, 2007 1:49:21 AM (6 years ago)

Author:

jrollins

Message:

debirf: a bunch of changes trying to not require root to build
debirf. this is sort of working, but there are some bugs that need to
be ironed out, and some structural changes to the package that need to
be addressed.

Location:

trunk/debirf

Files:

• debian/changelog (modified) (1 diff)
• debian/debirf.links (modified) (3 diffs)
• fs/usr/sbin/make-debirf (modified) (7 diffs)
• fs/usr/share/debirf/plugins/a0_apt-update (added)
• fs/usr/share/debirf/plugins/apt-get-disk-rescue (modified) (1 diff)
• fs/usr/share/debirf/plugins/z1_apt-clean (modified) (1 diff)

trunk/debirf/debian/changelog

@@ +1 @@
+debirf (0.6) unstable; urgency=low
+
+  * changed debootstrap to run with fakechroot
+  * changed plugins to run under fakeroot
+  * the above changes mean being root is not necessary to make-debirf.
+  * ***STILL IN DEVELOPMENT***
+
+ -- Jameson Rollins <jrollins@fifthhorseman.net>  Wed, 21 Nov 2007 01:32:50 -0500
+
 debirf (0.5) unstable; urgency=low
 

trunk/debirf/debian/debirf.links

@@ +1 @@
+/usr/share/debirf/plugins/a0_apt-update /etc/debirf/profiles/minimal/plugins/a0_apt-update
 /usr/share/debirf/plugins/a0_store-config /etc/debirf/profiles/minimal/plugins/a0_store-config
 /usr/share/debirf/plugins/a0_motd /etc/debirf/profiles/minimal/plugins/a0_motd
@@ -8 +9 @@
 /usr/share/debirf/plugins/z0_remove-locales /etc/debirf/profiles/minimal/plugins/z0_remove-locales
 /usr/share/debirf/plugins/z1_apt-clean /etc/debirf/profiles/minimal/plugins/z1_apt-clean
-/usr/share/debirf/plugins/z2_motd_end /etc/debirf/profiles/minimal/plugins/z2_motd_end
 
+/usr/share/debirf/plugins/a0_apt-update /etc/debirf/profiles/rescue/plugins/a0_apt-update
 /usr/share/debirf/plugins/a0_store-config /etc/debirf/profiles/rescue/plugins/a0_store-config
 /usr/share/debirf/plugins/a0_motd /etc/debirf/profiles/rescue/plugins/a0_motd
@@ -21 +22 @@
 /usr/share/debirf/plugins/z0_remove-locales /etc/debirf/profiles/rescue/plugins/z0_remove-locales
 /usr/share/debirf/plugins/z1_apt-clean /etc/debirf/profiles/rescue/plugins/z1_apt-clean
-/usr/share/debirf/plugins/z2_motd_end /etc/debirf/profiles/rescue/plugins/z2_motd_end

trunk/debirf/fs/usr/sbin/make-debirf

@@ -1 @@
-#!/bin/bash
+#!/bin/bash -e
 
 # make-debirf: script to build debirf system (must be root).
@@ -39 +39 @@
     # exclude aptitude
     mkdir -p "$DEBIRF_ROOT"
-    /usr/sbin/debootstrap --exclude=aptitude "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
+    #/usr/sbin/debootstrap --exclude=aptitude "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
+    fakeroot -s "$DEBIRF_FAKECHROOT_STATE" fakechroot debootstrap --variant=fakechroot "$DEBIRF_DISTRO" "$DEBIRF_ROOT" "$DEBIRF_MIRROR"
 }
 
@@ -47 +48 @@
         export $var
     done
-    run-parts --verbose "$DEBIRF_PLUGINS"
+    #run-parts --verbose "$DEBIRF_PLUGINS"
+    fakeroot -i "$DEBIRF_FAKECHROOT_STATE" -s "$DEBIRF_FAKECHROOT_STATE" run-parts --verbose "$DEBIRF_PLUGINS"
 }
 
@@ -133 +135 @@
 ### MAIN
 
-trap umount_proc-sys EXIT
+#trap umount_proc-sys EXIT
 
 if [ "$1" = '-h' -o "$1" = '--help' ] ; then
@@ -198 +200 @@
     fi
 fi
-    
+
+# check buildd
+if [ -z "$DEBIRF_BUILDD" ] ; then
+    failure "DEBIRF_BUILDD is not set."
+fi
+
+# check debirf root
+if [ -z "$DEBIRF_ROOT" ] ; then
+    failure "DEBIRF_ROOT is not set."
+fi
+
+# set fakechroot save file
+DEBIRF_FAKECHROOT_STATE="$DEBIRF_BUILDD/.fakechroot-$DEBIRF_LABEL.save"
+
+# check variables
 echo "Debirf variables:"
 for var in ${!DEBIRF_*}; do
@@ -210 +226 @@
 read -p "enter to continue: " OK
 
-# check buildd
-if [ -z "$DEBIRF_BUILDD" ] ; then
-    failure "DEBIRF_BUILDD is not set."
-fi
-
 # create debootstrap root
-if [ -z "$DEBIRF_ROOT" ] ; then
-    failure "DEBIRF_ROOT is not set."
-fi
 if [ -d "$DEBIRF_ROOT" ] ; then
     echo "Directory $DEBIRF_ROOT already exists."
@@ -247 +255 @@
 
 if [ "$DEBIRF_PLUGINS" ] ; then
-    mount_proc-sys
+    #mount_proc-sys
     
-    # update apt
-    debirf_exec apt-get update
-    
-    # install plugins
+    # run plugins
     msg "executing plugins..."
     run_plugins
     msg "plugins complete."
 
-    umount_proc-sys
+    #umount_proc-sys
 fi
 

trunk/debirf/fs/usr/share/debirf/plugins/apt-get-disk-rescue

@@ -12 +12 @@
 # or later.
 
-debirf_exec apt-get --assume-yes remove --purge aptitude
-
 debirf_exec apt-get --assume-yes install less moreutils lvm2 mdadm lsof screen hdparm smartmontools pciutils
 

trunk/debirf/fs/usr/share/debirf/plugins/z1_apt-clean

@@ -12 +12 @@
 # or later.
 
+debirf_exec apt-get --assume-yes remove --purge aptitude
+
 debirf_exec apt-get clean
 rm "$DEBIRF_ROOT/var/cache/apt/"*.bin