Merge pull request #35 from tenforward/plamo

plamo: fix for current Plamo 7.x
This commit is contained in:
Stéphane Graber 2020-09-05 12:23:09 -04:00 committed by GitHub
commit 0aab971c60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -183,9 +183,6 @@ configure_plamo6() {
EOF EOF
# configure the network using the dhcp # configure the network using the dhcp
echo "DHCP" > $rootfs/var/run/inet1-scheme echo "DHCP" > $rootfs/var/run/inet1-scheme
# glibc configure
mv $rootfs/etc/ld.so.conf{.new,}
chroot $rootfs ldconfig
# delete unnecessary process from rc.S # delete unnecessary process from rc.S
ed - $rootfs/etc/rc.d/rc.S <<- "EOF" ed - $rootfs/etc/rc.d/rc.S <<- "EOF"
@ -286,18 +283,13 @@ configure_plamo7() {
SERVICE="dhclient" SERVICE="dhclient"
EOF EOF
# initpkg # remove initpkg that do not execute on containers
noexec="shadow netconfig7 eudev openssh" noexec="shadow netconfig7 eudev openssh pkgtools${majorver}"
for f in $noexec for f in $noexec
do do
rm -f $rootfs/var/log/initpkg/"$f" rm -f $rootfs/var/log/initpkg/"$f"
done done
pushd $rootfs ( cd $rootfs/sbin ; mv installer_new installer )
for f in var/log/initpkg/*
do
chroot $rootfs sh ./$f
done
popd
} }
configure_plamo() { configure_plamo() {