Switch to mageia7

[distcook] / lib / install.sh

diff --git a/lib/install.sh b/lib/install.sh
index b945901240b4d742d21418c2fd9d95c30f4e9f0e..cf0636bda476c4721fdbdc8ad1604d405c853a64 100755 (executable)
--- a/lib/install.sh
+++ b/lib/install.sh
@@ -29,7 +29,7 @@ fi
 mkdir -p "$PWD/root"
 
 # Install base config
-LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --auto --root=$PWD/root filesystem basesystem-minimal rpm urpmi grub kernel-server-latest vim-enhanced wget
+LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --auto --root=$PWD/root filesystem basesystem-minimal rpm urpmi grub2 grub2-mageia-theme kernel-server-latest vim-enhanced wget
 
 # Reinstall lockdev to fix missing lock group on binary
 LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --auto --replacepkgs --replacefiles --root=$PWD/root lockdev
@@ -40,6 +40,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        acpi \
        acpid \
        bash-completion \
+       bc \
        bind \
        bind-utils \
        binutils \
@@ -52,12 +53,13 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        dosfstools \
        gdb \
        gdisk \
-       mageia-gfxboot-theme \
        git \
        git-prompt \
        git-svn \
        gnupg \
        gnupg2 \
+       groff \
+       hddtemp \
        hdparm \
        info \
        kernel-firmware \
@@ -70,6 +72,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        lsof \
        luit \
        lynx \
+       mageia-gfxboot-theme \
        man \
        man-pages \
        mdadm \
@@ -89,6 +92,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        postfix \
        rsnapshot \
        rsync \
+       screen \
        sectool \
        shorewall \
        shorewall-ipv6 \
@@ -103,6 +107,10 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        xfsprogs \
        zip
 
+#XXX: to avoid boot time warning
+#      drakx-kbd-mouse-x11 \
+#      polkit-agent-none \
+
 # Install locale
 if [ ! -z "$LOCALE_ALT" -a "$LOCALE_ALT" != 'en' ]; then
        LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --auto --root=$PWD/root \
@@ -111,4 +119,6 @@ if [ ! -z "$LOCALE_ALT" -a "$LOCALE_ALT" != 'en' ]; then
 fi
 
 # Install ihttpd
-LC_ALL=C urpmi --no-verify-rpm --no-recommends --noclean --auto --root=$PWD/root ${IHTTPD_RPM}
+if [ ! -z "${IHTTPD_RPM}" -a -f "${IHTTPD_RPM}" ]; then
+       LC_ALL=C urpmi --no-verify-rpm --no-recommends --noclean --auto --root=$PWD/root ${IHTTPD_RPM}
+fi