Конфиг из нового archiso

diff --git a/releng/build.sh b/releng/build.sh
index 10f1db2..560fda2 100755
--- a/releng/build.sh
+++ b/releng/build.sh
@@ -38,13 +38,9 @@ _usage ()

 # Helper function to run make_*() only one time per architecture.
 run_once() {
-    echo -n "==> Target $1 for $arch: "
     if [[ ! -e ${work_dir}/build.${1}_${arch} ]]; then
-       echo "running"
         $1
         touch ${work_dir}/build.${1}_${arch}
-    else
-        echo "skipping"
     fi
 }

@@ -84,7 +80,7 @@ make_customize_root_image() {
     cp -af ${script_path}/root-image ${work_dir}/${arch}

     patch ${work_dir}/${arch}/root-image/usr/bin/pacman-key < ${script_path}/pacman-key-4.0.3_unattended-keyring-init.patch
-    wget -O ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'
+    curl -o ${work_dir}/${arch}/root-image/etc/pacman.d/mirrorlist 'https://www.archlinux.org/mirrorlist/?country=all&protocol=http&use_mirror_status=on'

     lynx -dump -nolist 'https://wiki.archlinux.org/index.php/Installation_Guide?action=render' >> ${work_dir}/${arch}/root-image/root/install.txt

@@ -145,9 +141,9 @@ make_efi() {
         ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf

     # EFI Shell 2.0 for UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=UEFI_Shell )
-    wget -O ${work_dir}/iso/EFI/shellx64_v2.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi
+    curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/ShellBinPkg/UefiShell/X64/Shell.efi
     # EFI Shell 1.0 for non UEFI 2.3+ ( http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=Efi-shell )
-    wget -O ${work_dir}/iso/EFI/shellx64_v1.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
+    curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2/EdkShellBinPkg/FullShell/X64/Shell_Full.efi
 }

 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
diff --git a/releng/mkinitcpio.conf b/releng/mkinitcpio.conf
index fa34f3e..f676106 100644
--- a/releng/mkinitcpio.conf
+++ b/releng/mkinitcpio.conf
@@ -1,2 +1,2 @@
-HOOKS="base udev timestamp memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems usbinput"
+HOOKS="base udev timestamp memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block pcmcia filesystems keyboard"
 COMPRESSION="xz"
diff --git a/releng/packages.both b/releng/packages.both
index 39129f9..87a9d5a 100644
--- a/releng/packages.both
+++ b/releng/packages.both
@@ -31,7 +31,6 @@ nfs-utils
 nilfs-utils
 nmap
 ntfs-3g
-ntfsprogs
 ntp
 openconnect
 openssh
diff --git a/releng/packages.x86_64 b/releng/packages.x86_64
index 137c9d5..aceb6cf 100644
--- a/releng/packages.x86_64
+++ b/releng/packages.x86_64
@@ -1,3 +1,3 @@
 grub-efi-x86_64
-gummiboot-efi
+gummiboot
 refind-efi
diff --git a/releng/root-image/etc/systemd/system/dhcpcd.service b/releng/root-image/etc/systemd/system/dhcpcd.service
deleted file mode 100644
index dd030d5..0000000
--- a/releng/root-image/etc/systemd/system/dhcpcd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=dhcpcd on all interfaces
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd.pid
-ExecStart=/sbin/dhcpcd -A -b -q
-ExecStop=/sbin/dhcpcd -k
-
-[Install]
-WantedBy=multi-user.target
diff --git a/releng/root-image/root/pkg/package-query/PKGBUILD b/releng/root-image/root/pkg/package-query/PKGBUILD
deleted file mode 100644
index 32553cc..0000000
--- a/releng/root-image/root/pkg/package-query/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: tuxce <tuxce.net@gmail.com>
-pkgname=package-query
-pkgver=1.1
-pkgrel=2
-pkgdesc="Query ALPM and AUR"
-arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h')
-url="http://gitweb.archlinux.fr/package-query.git/"
-license=('GPL')
-depends=('pacman>=4.0' 'pacman<4.1' curl 'yajl>=2.0')
-source=(http://mir.archlinux.fr/~tuxce/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --localstatedir=/var --prefix=/usr --sysconfdir=/etc --with-aur-url=https://aur.archlinux.org
-  make
-}
-
-package ()
-{
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
-
-md5sums=('becb5734dd531631cbe2e1c9cf82ae9e')
diff --git a/releng/root-image/root/pkg/yaourt/PKGBUILD b/releng/root-image/root/pkg/yaourt/PKGBUILD
deleted file mode 100644
index 2402130..0000000
--- a/releng/root-image/root/pkg/yaourt/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Author: Julien MISCHKOWITZ <wain@archlinux.fr>
-# Author: tuxce <tuxce.net@gmail.com>
-
-pkgname=yaourt
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="A pacman wrapper with extended features and AUR support"
-arch=('any')
-url="http://www.archlinux.fr/yaourt-en/"
-license=(GPL)
-depends=('diffutils' 'pacman>=4.0' 'package-query>=1.0' 'gettext')
-optdepends=('aurvote: vote for favorite packages from AUR'
-      'customizepkg: automatically modify PKGBUILD during install/upgrade'
-      'rsync: retrieve PKGBUILD from official repositories'
-      'pacman-color: fully colorized output')
-backup=('etc/yaourtrc')
-source=(http://mir.archlinux.fr/~tuxce/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-
-build() { 
-  cd $srcdir/$pkgname-$pkgver/
-  make PREFIX=/usr sysconfdir=/etc localstatedir=/var 
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver/
-  make PREFIX=/usr sysconfdir=/etc localstatedir=/var DESTDIR=$pkgdir install
-}
-
-md5sums=('b6341eec9b247c1cb9c743af80d190c2')
-# vim:set ts=2 sw=2 et:
m1kc / energy

Конфиг из нового archiso #60
