summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2018-01-06 23:48:38 +0800
committerIru Cai <mytbk920423@gmail.com>2018-01-06 23:48:38 +0800
commitd57a360f401f710e9f33595176994c742d23548f (patch)
tree622406ac5f9841e62f66d17b440546f7cf7a8629
parent87d2b20836a05267e51e06817124d6a944d4fac8 (diff)
downloadliveusb-builder-d57a360f401f710e9f33595176994c742d23548f.tar.xz
update arch and gloriousarch
-rw-r--r--distro/arch/isoinfo4
-rw-r--r--distro/gloriousarch/mate/entry17
-rw-r--r--distro/gloriousarch/mate/install.sh11
-rw-r--r--distro/gloriousarch/mate/isoinfo9
-rw-r--r--distro/gloriousarch/xfce/entry12
-rw-r--r--distro/gloriousarch/xfce/isoinfo6
6 files changed, 33 insertions, 6 deletions
diff --git a/distro/arch/isoinfo b/distro/arch/isoinfo
index 33dff3f..cf06ef8 100644
--- a/distro/arch/isoinfo
+++ b/distro/arch/isoinfo
@@ -1,7 +1,7 @@
-_isodate=2017.09.01
+_isodate=2018.01.01
ISONAME="$DISTRONAME $_isodate"
ISOURL=iso/$_isodate/archlinux-$_isodate-x86_64.iso
-SHA1=b0490c8471e3059bf1e3759ade38a63570b301ae
+SHA1=6c98c1932731eff98e430958c3589c4124bafbe9
mirrorlist=(
https://mirrors.tuna.tsinghua.edu.cn/archlinux
diff --git a/distro/gloriousarch/mate/entry1 b/distro/gloriousarch/mate/entry1
new file mode 100644
index 0000000..188a3b7
--- /dev/null
+++ b/distro/gloriousarch/mate/entry1
@@ -0,0 +1,7 @@
+TITLE='Glorious Arch x86_64 (MATE)'
+_name=garch/mate
+KERNEL="/liveusb-kernel/$_name/x86_64/vmlinuz"
+INITRD=("/liveusb-kernel/$_name/intel_ucode.img"
+ "/liveusb-kernel/$_name/x86_64/archiso.img")
+OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/$_name"
+X64=y
diff --git a/distro/gloriousarch/mate/install.sh b/distro/gloriousarch/mate/install.sh
new file mode 100644
index 0000000..0c0e642
--- /dev/null
+++ b/distro/gloriousarch/mate/install.sh
@@ -0,0 +1,11 @@
+_name=garch/mate
+install_live() {
+ mount_iso
+ install -d "$DATADIR/$_name"
+ install -d "$KERNELDIR/$_name"
+ cp -r "$ISOMNT/arch/x86_64" "$DATADIR/$_name/"
+ cp -r "$ISOMNT/arch/boot/x86_64" "$KERNELDIR/$_name/"
+ cp "$ISOMNT/arch/boot/intel_ucode.img" "$KERNELDIR/$_name/"
+ umount_iso
+}
+
diff --git a/distro/gloriousarch/mate/isoinfo b/distro/gloriousarch/mate/isoinfo
new file mode 100644
index 0000000..8ca25c4
--- /dev/null
+++ b/distro/gloriousarch/mate/isoinfo
@@ -0,0 +1,9 @@
+_isodate=2018-01-06
+_desktop=mate
+ISONAME="$DISTRONAME $_desktop $_isodate"
+ISOURL=garch-$_desktop-$_isodate.iso
+SHA256=2b830d2b3521c11a1802041f23cbf7cd926a4a89c7e541c541f8ff45a90a9bd7
+
+mirrorlist=(
+https://sourceforge.net/projects/garchiso/files
+)
diff --git a/distro/gloriousarch/xfce/entry1 b/distro/gloriousarch/xfce/entry1
index 8275c5a..6cabe21 100644
--- a/distro/gloriousarch/xfce/entry1
+++ b/distro/gloriousarch/xfce/entry1
@@ -1,4 +1,4 @@
-TITLE='Glorious Arch x86_64'
+TITLE='Glorious Arch x86_64 (Xfce)'
_name=garch/xfce
KERNEL="/liveusb-kernel/$_name/x86_64/vmlinuz"
INITRD=("/liveusb-kernel/$_name/intel_ucode.img"
diff --git a/distro/gloriousarch/xfce/isoinfo b/distro/gloriousarch/xfce/isoinfo
index 3d281f9..1a93037 100644
--- a/distro/gloriousarch/xfce/isoinfo
+++ b/distro/gloriousarch/xfce/isoinfo
@@ -1,8 +1,8 @@
-_isodate=20170923
+_isodate=2018-01-06
_desktop=xfce
ISONAME="$DISTRONAME $_desktop $_isodate"
-ISOURL=gloriousarch-$_desktop-$_isodate.iso
-SHA256=b6e3b64005ecf9c6e78297fad72e737fc7a0f7ff68700cdac9f221e1b2f7faa4
+ISOURL=garch-$_desktop-$_isodate.iso
+SHA256=6221d8863c74843f61c65f58b6a16baaa7f85a41fec79d4e9a40a9d4fafef4c0
mirrorlist=(
https://sourceforge.net/projects/garchiso/files