diff options
| author | Jan Wagner <mail@jwagner.eu> | 2015-12-15 02:38:15 +0100 |
|---|---|---|
| committer | Jan Wagner <mail@jwagner.eu> | 2015-12-15 02:38:15 +0100 |
| commit | f33a610b0e308c66c4688c50b33a0dd6c9c196ec (patch) | |
| tree | 99dd59ccbd43a98bba5ee7f380b5e6753333513f | |
| parent | be69a54e1e9dde183669697d8605e6784c79e50a (diff) | |
| download | rpi2-gen-image-f33a610b0e308c66c4688c50b33a0dd6c9c196ec.tar.gz rpi2-gen-image-f33a610b0e308c66c4688c50b33a0dd6c9c196ec.tar.bz2 rpi2-gen-image-f33a610b0e308c66c4688c50b33a0dd6c9c196ec.zip | |
Removed ENABLE_SYSTEMD(=false)
| -rwxr-xr-x | rpi2-gen-image.sh | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/rpi2-gen-image.sh b/rpi2-gen-image.sh index 67315e3..cc0a968 100755 --- a/rpi2-gen-image.sh +++ b/rpi2-gen-image.sh @@ -53,7 +53,6 @@ ENABLE_CONSOLE=${ENABLE_CONSOLE:=true} ENABLE_IPV6=${ENABLE_IPV6:=true} ENABLE_SSHD=${ENABLE_SSHD:=true} ENABLE_SOUND=${ENABLE_SOUND:=true} -ENABLE_SYSTEMD=${ENABLE_SYSTEMD:=true} ENABLE_DBUS=${ENABLE_DBUS:=true} ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true} ENABLE_MINGPU=${ENABLE_MINGPU:=false} @@ -75,7 +74,7 @@ REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static dosfstool MISSING_PACKAGES="" # Packages required in the chroot build enviroment -APT_INCLUDES="apt-transport-https,ca-certificates,debian-archive-keyring,dialog,locales,apt-utils,vim-tiny" +APT_INCLUDES="apt-transport-https,ca-certificates,debian-archive-keyring,dialog,locales" set +x @@ -121,11 +120,6 @@ trap cleanup 0 1 2 3 6 # Set up chroot directory mkdir -p $R -# Use traditional SystemV init instead of systemd services -if [ "$ENABLE_SYSTEMD" = false ] ; then - APT_INCLUDES="${APT_INCLUDES},sysvinit-core" -fi - # Add dbus package, recommended if using systemd if [ "$ENABLE_DBUS" = true ] ; then APT_INCLUDES="${APT_INCLUDES},dbus" @@ -159,11 +153,6 @@ fi debootstrap --arch=armhf --foreign --include=${APT_INCLUDES} $RELEASE $R ${APT_PROXY}${APT_SERVER}/debian cp /usr/bin/qemu-arm-static $R/usr/bin -# Remove systemd related packages from list of packages to be bootstrapped -if [ "$ENABLE_SYSTEMD" = false ] ; then - chroot $R sed -i -e 's/systemd systemd-sysv //g' /debootstrap/required -fi - # Copy debian-archive-keyring.pgp chroot $R mkdir -p /usr/share/keyrings cp /usr/share/keyrings/debian-archive-keyring.gpg $R/usr/share/keyrings/debian-archive-keyring.gpg |