about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2014-02-03 23:43:48 +0100
committerJuan RP <xtraeme@gmail.com>2014-02-03 23:43:48 +0100
commit0d81294fcce9b73e46595b6d9abe052b0f5a8abe (patch)
tree7203dfe2bf420003a22a146ddd826576edea9413
parent1ccbe860517465abe70d8b450fa6cae69ab4b691 (diff)
downloadhrmpf-0d81294fcce9b73e46595b6d9abe052b0f5a8abe.tar.gz
hrmpf-0d81294fcce9b73e46595b6d9abe052b0f5a8abe.tar.xz
hrmpf-0d81294fcce9b73e46595b6d9abe052b0f5a8abe.zip
Revert "installer/mklive: make sure to install dcron rather than cronie."
This reverts commit 1ccbe860517465abe70d8b450fa6cae69ab4b691.

I'll fix this properly via base-system.
-rw-r--r--installer.sh.in2
-rw-r--r--mklive.sh.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/installer.sh.in b/installer.sh.in
index 8eb0138..a283d2e 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -757,7 +757,7 @@ install_packages() {
     mkdir -p $TARGETDIR/var/db/xbps/keys
     cp /var/db/xbps/keys/*.plist $TARGETDIR/var/db/xbps/keys
     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..." \
         --programbox 24 80
     if [ $? -ne 0 ]; then
diff --git a/mklive.sh.in b/mklive.sh.in
index 50ef39d..0a4e628 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -321,9 +321,9 @@ fi
 . $CONFIG_FILE
 
 if [ -z "$PACKAGE_LIST" ]; then
-    PACKAGE_LIST="dcron base-system dialog"
+    PACKAGE_LIST="base-system dialog"
 else
-    PACKAGE_LIST="dcron base-system dialog $PACKAGE_LIST"
+    PACKAGE_LIST="base-system dialog $PACKAGE_LIST"
 fi
 if [ ! -f $SYSLINUX_DATADIR/isolinux.bin ]; then
     echo "Missing required isolinux files in $SYSLINUX_DATADIR, exiting..."