enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to debootstrap-ng

Browse Source
This commit is contained in:
zador-blood-stained 2016-05-27 12:42:44 +03:00
parent 6554d1addf
commit 6027c4efea
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
debootstrap-ng.sh
View File

@ -166,7 +166,7 @@ create_rootfs_cache()
# policy-rc.d script prevents starting or reloading services during image creation
printf '#!/bin/sh\nexit 101' > $CACHEDIR/sdcard/usr/sbin/policy-rc.d
chmod 755 $CACHEDIR/sdcard/usr/sbin/policy-rc.d
if [[ -x $CACHEDIR/sdcard/sbin/initctl ]]; then
if [[ -x $CACHEDIR/sdcard/sbin/start-stop-daemon ]]; then
mv $CACHEDIR/sdcard/sbin/start-stop-daemon $CACHEDIR/sdcard/sbin/start-stop-daemon.REAL
printf '#!/bin/sh\necho "Warning: Fake start-stop-daemon called, doing nothing"' > $CACHEDIR/sdcard/sbin/start-stop-daemon
chmod 755 $CACHEDIR/sdcard/sbin/start-stop-daemon
@ -227,6 +227,19 @@ create_rootfs_cache()
#[[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Upgrading base packages failed"
# new initctl and start-stop-daemon may be installed after upgrading base packages
# TODO: Reduce code duplication
if [[ -x $CACHEDIR/sdcard/sbin/start-stop-daemon ]]; then
mv $CACHEDIR/sdcard/sbin/start-stop-daemon $CACHEDIR/sdcard/sbin/start-stop-daemon.REAL
printf '#!/bin/sh\necho "Warning: Fake start-stop-daemon called, doing nothing"' > $CACHEDIR/sdcard/sbin/start-stop-daemon
chmod 755 $CACHEDIR/sdcard/sbin/start-stop-daemon
fi
if [[ -x $CACHEDIR/sdcard/sbin/initctl ]]; then
mv $CACHEDIR/sdcard/sbin/initctl $CACHEDIR/sdcard/sbin/initctl.REAL
printf '#!/bin/sh\necho "Warning: Fake initctl called, doing nothing"' $CACHEDIR/sdcard/sbin/initctl
chmod 755 $CACHEDIR/sdcard/sbin/initctl
fi
# stage: install additional packages
display_alert "Installing packages for" "Armbian" "info"
eval 'LC_ALL=C LANG=C chroot $CACHEDIR/sdcard /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y -q \