MT#11263 Remove boot option ngcpsystemd (replaced by Jessie VMs)

It was a temparary option to check systemd on wheezy while we
were waiting for Jessie. Systemd doesn't work well in wheezy,
we had a problems wil kamailio-config-tests and other components.

So, currently we have Jessie VMs available and no reason to keep the
code here as we are not going to use systemd on wheezy anyway.

Change-Id: I1c35b4e3bdd9718107812e7ac2112e796c2e83b0
changes/84/884/1
Alexander Lutay 10 years ago
parent 3b73ba8dbb
commit 8ea34f8222

@ -59,7 +59,6 @@ VAGRANT=false
ADJUST_FOR_LOW_PERFORMANCE=false
ENABLE_VM_SERVICES=false
FILESYSTEM="ext4"
SYSTEMD=false
DEBIAN_REPO_HOST="debian.sipwise.com"
SIPWISE_REPO_HOST="deb.sipwise.com"
SIPWISE_REPO_TRANSPORT="http"
@ -517,11 +516,6 @@ if checkBootParam enablevmservices ; then
ENABLE_VM_SERVICES=true
fi
if checkBootParam ngcpsystemd ; then
logit "Enabling systemd support as requested via boot option ngcpsystemd"
SYSTEMD=true
fi
if checkBootParam ngcpnonwrecfg ; then
logit "Disabling reconfig network as requested via boot option ngcpnonwrecfg"
RESTART_NETWORK=false
@ -1128,35 +1122,6 @@ cp /etc/apt/trusted.gpg.d/sipwise.gpg "\${MNTPOINT}"/etc/apt/trusted.gpg.d/
EOF
chmod 775 /etc/debootstrap/pre-scripts/install-sipwise-key.sh
if "$SYSTEMD" ; then
logit "Enabling systemd installation via grml-debootstrap"
mkdir -p /etc/debootstrap/scripts/
cat > /etc/debootstrap/scripts/systemd.sh << EOF
#!/bin/bash
# installed via deployment.sh
echo "systemd.sh: mounting rootfs $ROOT_FS to $TARGET"
mount "$ROOT_FS" "$TARGET"
echo "systemd.sh: enabling ${DEBIAN_RELEASE} backports"
echo deb http://${DEBIAN_REPO_HOST}/debian/ ${DEBIAN_RELEASE}-backports main contrib non-free >> ${TARGET}/etc/apt/sources.list.d/systemd.list
chroot $TARGET apt-get update
echo "systemd.sh: installing systemd"
echo 'Yes, do as I say!' | chroot $TARGET apt-get -t ${DEBIAN_RELEASE}-backports --force-yes -y install systemd-sysv sysvinit-
echo "systemd.sh: verifying that acpid is enabled"
if ! chroot $TARGET systemctl is-enabled acpid.service ; then
echo "acpid service is disabled, enabling"
chroot $TARGET systemctl enable acpid.service
fi
echo "systemd.sh: unmounting $TARGET again"
umount "$TARGET"
EOF
chmod 775 /etc/debootstrap/scripts/systemd.sh
fi
# drop this once we mirror Debian/jessie
if [ "$DEBIAN_RELEASE" = "jessie" ] ; then
MIRROR='http://debian.inode.at/debian/'

Loading…
Cancel
Save