Add root.mount to ignored files

[distcook] / lib / install.sh

diff --git a/lib/install.sh b/lib/install.sh
index df24193aa662aea2b69381e028bfd8d4b17355b4..43120cf957d1daeea3939eb514c8e062abd2a485 100755 (executable)
--- a/lib/install.sh
+++ b/lib/install.sh
@@ -29,12 +29,13 @@ 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 lockdev
 
 # 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
 
 # Install remaining
+# --skip lib64gdbm4
 LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --auto --root=$PWD/root \
        acl \
        acpi \
@@ -50,6 +51,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        cryptsetup \
        deltarpm \
        dhcp-client \
+       dmsetup \
        dosfstools \
        gdb \
        gdisk \
@@ -78,7 +80,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        mdadm \
        microcode \
        mirrordir \
-       mlocate \
+       plocate \
        msec \
        nail \
        ntfs-3g \
@@ -93,7 +95,6 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut
        rsnapshot \
        rsync \
        screen \
-       sectool \
        shorewall \
        shorewall-ipv6 \
        smartmontools \
@@ -107,6 +108,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 \
@@ -115,4 +120,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