summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2017-03-08 17:16:23 +0800
committerIru Cai <mytbk920423@gmail.com>2017-03-08 17:24:08 +0800
commit28cf5ab3e6d43ed4b9773c768be96102da8629fb (patch)
treeab2501bc243109ed203a3a0f44b5d39ce7733739
parentd4c818b818bac8960c7622af00be2500adb3a613 (diff)
downloadliveusb-builder-28cf5ab3e6d43ed4b9773c768be96102da8629fb.tar.xz
distro/arch: update to 2017.03.01
-rw-r--r--distro/arch/entry26
-rw-r--r--distro/arch/install.sh4
-rw-r--r--distro/arch/isoinfo4
3 files changed, 4 insertions, 10 deletions
diff --git a/distro/arch/entry2 b/distro/arch/entry2
deleted file mode 100644
index 70363ce..0000000
--- a/distro/arch/entry2
+++ /dev/null
@@ -1,6 +0,0 @@
-TITLE='Arch Linux i686'
-KERNEL=/liveusb-kernel/arch/i686/vmlinuz
-INITRD=(/liveusb-kernel/arch/intel_ucode.img
- /liveusb-kernel/arch/i686/archiso.img)
-OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/arch"
-X64=n
diff --git a/distro/arch/install.sh b/distro/arch/install.sh
index c579442..cd27519 100644
--- a/distro/arch/install.sh
+++ b/distro/arch/install.sh
@@ -1,9 +1,9 @@
install_live() {
mount_iso
install -d "$DATADIR/arch"
- cp -r "$ISOMNT/arch/"{i686,x86_64} "$DATADIR/arch/"
+ cp -r "$ISOMNT/arch/x86_64" "$DATADIR/arch/"
install -d "$KERNELDIR/arch"
- cp -r "$ISOMNT/arch/boot/"{i686,x86_64} "$KERNELDIR/arch/"
+ cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/arch/"
cp "$ISOMNT/arch/boot/intel_ucode.img" "$KERNELDIR/arch/"
umount_iso
}
diff --git a/distro/arch/isoinfo b/distro/arch/isoinfo
index 4b505dd..8acc451 100644
--- a/distro/arch/isoinfo
+++ b/distro/arch/isoinfo
@@ -1,7 +1,7 @@
-_isodate=2016.11.01
+_isodate=2017.03.01
ISONAME="$DISTRONAME $_isodate"
ISOURL=iso/$_isodate/archlinux-$_isodate-dual.iso
-SHA1=5f7ceacd97d730a007ef277847713c6031b632ec
+SHA1=f426866ca632a35a3eeae8e4080cff25ec8da614
mirrorlist=(
https://mirrors.tuna.tsinghua.edu.cn/archlinux