Merge branch 'next'

README.md

@@ -18,7 +18,7 @@ zsh debootstrap sudo kpartx cgpt xz-utils
 
 ## Documentation
 
-Find documentation inside the `doc` directory of libdevuansdk.
+Find documentation inside the `docs` directory of libdevuansdk.
 
 ## Notes
 

config

@@ -24,7 +24,7 @@ arrs+=(core_packages base_packages purge_packages blend_packages)
 
 os="devuan"
 release="jessie"
-version="1.0.0-beta2.rc1"
+version="1.0.0-beta2"
 mirror="http://auto.mirror.devuan.org/merged"
 section="main"
 

docs/helper_functions.7.md

@@ -50,5 +50,11 @@ so that apt doesn't autostart daemons when they are installed.
 this function will allow root login with password in the bootstrapped rootfs.
 
 
+## chroot-script()  
+allows you to chroot inside the `$strapdir` and execute the
+script/binary that's given to it.
+takes an optional argument: `-d` (will call dpkgdivert on and off)
+
+
 ## silly()  
 a funny function printing out random messages.

libdevuansdk

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
 
-libdevuansdk_version="0.2"
+libdevuansdk_version="0.3"
 LIBPATH=${LIBPATH:-`dirname $0`}
 
 source $LIBPATH/config

zlibs/bootstrap

@@ -63,8 +63,6 @@ bootstrap_complete_base() {
 	## write third-stage for chroot
 	bootstrap_config_thirdstage | sudo tee $strapdir/thirdstage
 	bootstrap_config_cleanup    | sudo tee $strapdir/cleanup
-	sudo chmod +x $strapdir/thirdstage
-	sudo chmod +x $strapdir/cleanup
 
 	## chroot into it and configure further
 	## debootstrap stage 3
@@ -72,10 +70,7 @@ bootstrap_complete_base() {
 
 	devprocsys mount $strapdir || zerr
 
-	dpkgdivert on  $strapdir
+	chroot-script -d thirdstage cleanup || zerr
-	sudo -E chroot $strapdir /thirdstage || zerr
-	sudo -E chroot $strapdir /cleanup    || zerr
-	dpkgdivert off $strapdir
 
 	sleep 1
 	devprocsys umount $strapdir || zerr
@@ -94,7 +89,7 @@ rm -f /thirdstage
 rm -f /etc/ssh/*_key
 rm -f /etc/ssh/*.pub
 rm -f /root/.bash_history
-#rm -f /usr/bin/qemu-*
+#rm -f /usr/bin/qemu-arm-static
 ## our file for which we check the bootstrap is complete
 echo "1" > .done
 rm -f /cleanup
@@ -141,8 +136,7 @@ apt-get clean
 rm -f /prepack
 EOF
 
-	sudo chmod +x $strapdir/prepack || zerr
+	chroot-script prepack || zerr
-	sudo -E chroot $strapdir  /prepack || zerr
 
 	local _dest=$(dirname $bootstrap_tgz)
 
@@ -185,14 +179,13 @@ apt-get clean
 rm -f /postunpack
 EOF
 
-	dpkgdivert on $strapdir
 	devprocsys mount $strapdir
-	sudo chmod +x $strapdir/postunpack   || zerr
+	chroot-script -d postunpack || zerr
-	sudo -E chroot $strapdir /postunpack || zerr
 	devprocsys umount $strapdir
-	dpkgdivert off $strapdir
 
 	## below typically used in arm-sdk
 	[[ -z $inittab ]] || { print $inittab | sudo tee -a $strapdir/etc/inittab }
-	for i in $custmodules;do print $i | sudo tee -a $strapdir/etc/modules; done
+	for i in $custmodules; do
+		print $i | sudo tee -a $strapdir/etc/modules
+	done
 }

zlibs/helpers

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
 
-## helper functions that make your life easier
+## helper functions that make my life easier
 
 build_image_dist() {
 	fn build_image_dist
@@ -138,8 +138,8 @@ dpkg-divert --remove --rename /usr/sbin/invoke-rc.d
 rm -f /dpkgdivert
 EOF
 	fi
-	sudo chmod +x $werdo/dpkgdivert
+
-	sudo -E chroot $werdo /dpkgdivert || zerr
+	chroot-script dpkgdivert || zerr
 }
 
 enableserv() {
@@ -154,8 +154,7 @@ update-rc.d ${service} enable
 EOF
 
 	notice "enabling $service service"
-	sudo chmod +x $strapdir/enserv
+	chroot-script enserv
-	sudo -E chroot $strapdir /enserv
 }
 
 disableserv() {
@@ -170,8 +169,7 @@ update-rc.d ${service} disable
 EOF
 
 	notice "disabling $service service"
-	sudo chmod +x $strapdir/disserv
+	chroot-script disserv
-	sudo -E chroot $strapdir /disserv
 }
 
 enablessh() {
@@ -183,9 +181,9 @@ enablessh() {
 #!/bin/sh
 sed -i -e 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
 update-rc.d ssh enable
-chmod +x /etc/init.d/regensshkeys
 update-rc.d regensshkeys defaults
 update-rc.d regensshkeys enable
+rm -f /enssh
 EOF
 
 	cat <<EOF | sudo tee ${strapdir}/etc/init.d/regensshkeys
@@ -222,10 +220,9 @@ case "\$1" in
 esac
 EOF
 
-	dpkgdivert on $strapdir
+	sudo chmod +x $strapdir/etc/init.d/regensshkeys
-	sudo chmod +x $strapdir/enssh
+
-	sudo -E chroot $strapdir /enssh
+	chroot-script -d enssh
-	dpkgdivert off $strapdir
 }
 
 install-custdebs() {
@@ -246,8 +243,35 @@ apt-get autoremove
 apt-get clean
 rm -rf /debs install-debs
 EOF
-	sudo chmod +x $strapdir/install-debs
+	chroot-script install-debs
-	sudo -E chroot $strapdir /install-debs
+}
+
+chroot-script() {
+	fn chroot-script "$@"
+
+	case "x$1" in
+		x-d)
+			shift 1
+			local scripts="$@"
+
+			dpkgdivert on $strapdir
+			for i in $scripts; do
+				notice "chrooting to execute $i..."
+				sudo chmod +x $strapdir/$i
+				sudo -E chroot $strapdir /$i
+			done
+			dpkgdivert off $strapdir
+			;;
+		*)
+			local scripts="$@"
+
+			for i in $scripts; do
+				notice "chrooting to execute $i..."
+				sudo chmod +x $strapdir/$i
+				sudo -E chroot $strapdir /$i
+			done
+			;;
+	esac
 }
 
 silly() {

zlibs/iso

@@ -36,10 +36,8 @@ apt-get --yes --force-yes autoremove
 apt-get clean
 rm -f /isoprep
 EOF
-	dpkgdivert on $strapdir
+
-	sudo chmod +x $strapdir/isoprep
+	chroot-script -d isoprep || zerr
-	sudo -E chroot $strapdir /isoprep
-	dpkgdivert off $strapdir
 }
 
 iso_setup_isolinux() {

zlibs/kernel

@@ -33,7 +33,7 @@ build_kernel_amd64() {
 	dpkgdivert on $strapdir
 	devprocsys mount $strapdir
 
-	sudo chroot $strapdir \
+	sudo -E chroot $strapdir \
 		apt-get --yes --force-yes install $kernel
 
 	devprocsys umount $strapdir
@@ -54,7 +54,7 @@ build_kernel_i386() {
 	dpkgdivert on $strapdir
 	devprocsys mount $strapdir
 
-	sudo chroot $strapdir \
+	sudo -E chroot $strapdir \
 		apt-get --yes --force-yes install $kernel
 
 	devprocsys umount $strapdir

zlibs/rsync

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this source code. If not, see <http://www.gnu.org/licenses/>.
 
-## ilporcodio
+## ilpd
 
 rsync_to_raw_image() {
 	fn rsync_to_raw_image
@@ -35,6 +35,7 @@ rsync_to_raw_image() {
 		die "not enough space. report a bug please"
 		zerr
 	}
+
 	if [[ $parted_type = dos ]]; then
 		sudo rsync -HPavz -q ./boot/* $workdir/boot || {
 			image_raw_umount

zlibs/sysconf

@@ -39,7 +39,7 @@ proc            /proc          proc    nodev,noexec,nosuid    0      0
 /dev/sda2       /              ext4    errors=remount-ro      0      1
 
 # boot
-/dev/sda1       /boot          ext2    noauto                 0      0
+/dev/sda1       /boot          ext2    defaults               0      0
 EOF
 }