X-Git-Url: https://git.rapsys.eu/distcook/blobdiff_plain/658759498941fe6b714790087db75ea29050ddee..HEAD:/lib/install.sh diff --git a/lib/install.sh b/lib/install.sh index b945901..43120cf 100755 --- a/lib/install.sh +++ b/lib/install.sh @@ -29,17 +29,19 @@ 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 \ acpid \ bash-completion \ + bc \ bind \ bind-utils \ binutils \ @@ -49,15 +51,17 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut cryptsetup \ deltarpm \ dhcp-client \ + dmsetup \ dosfstools \ gdb \ gdisk \ - mageia-gfxboot-theme \ git \ git-prompt \ git-svn \ gnupg \ gnupg2 \ + groff \ + hddtemp \ hdparm \ info \ kernel-firmware \ @@ -70,12 +74,13 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut lsof \ luit \ lynx \ + mageia-gfxboot-theme \ man \ man-pages \ mdadm \ microcode \ mirrordir \ - mlocate \ + plocate \ msec \ nail \ ntfs-3g \ @@ -89,7 +94,7 @@ LC_ALL=C urpmi --downloader=wget --no-verify-rpm --no-recommends --noclean --aut postfix \ rsnapshot \ rsync \ - sectool \ + screen \ shorewall \ shorewall-ipv6 \ smartmontools \ @@ -103,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 \ @@ -111,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