mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "installer/mklive: make sure to install dcron rather than cronie."

Browse Source 
This reverts commit 1ccbe860517465abe70d8b450fa6cae69ab4b691.

I'll fix this properly via base-system.
This commit is contained in:
Juan RP 2014-02-03 23:43:48 +01:00
parent 1ccbe86051
commit 0d81294fcc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer.sh.in
View File

@ -757,7 +757,7 @@ install_packages() {
mkdir -p $TARGETDIR/var/db/xbps/keys mkdir -p $TARGETDIR/var/db/xbps/keys
cp /var/db/xbps/keys/*.plist $TARGETDIR/var/db/xbps/keys cp /var/db/xbps/keys/*.plist $TARGETDIR/var/db/xbps/keys
mkdir -p $TARGETDIR/boot/grub mkdir -p $TARGETDIR/boot/grub
stdbuf -oL xbps-install -r $TARGETDIR -Sy dcron base-system ${_grub} 2>&1 | \ stdbuf -oL xbps-install -r $TARGETDIR -Sy base-system ${_grub} 2>&1 | \
DIALOG --title "Installing base system packages..." \ DIALOG --title "Installing base system packages..." \
--programbox 24 80 --programbox 24 80
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then

4
mklive.sh.in
View File

@ -321,9 +321,9 @@ fi
. $CONFIG_FILE . $CONFIG_FILE
if [ -z "$PACKAGE_LIST" ]; then if [ -z "$PACKAGE_LIST" ]; then
PACKAGE_LIST="dcron base-system dialog" PACKAGE_LIST="base-system dialog"
else else
PACKAGE_LIST="dcron base-system dialog $PACKAGE_LIST" PACKAGE_LIST="base-system dialog $PACKAGE_LIST"
fi fi
if [ ! -f $SYSLINUX_DATADIR/isolinux.bin ]; then if [ ! -f $SYSLINUX_DATADIR/isolinux.bin ]; then
echo "Missing required isolinux files in $SYSLINUX_DATADIR, exiting..." echo "Missing required isolinux files in $SYSLINUX_DATADIR, exiting..."