From 2dd63bfc914e6737089dd93cad7adf61dd3f9a4c Mon Sep 17 00:00:00 2001
From: Iru Cai <mytbk920423@gmail.com>
Date: Thu, 25 Jan 2018 16:43:51 +0800
Subject: gloriousarch: update, add nox version, iomem=relaxed

---
 distro/gloriousarch/mate/entry1    |  2 +-
 distro/gloriousarch/mate/isoinfo   |  4 ++--
 distro/gloriousarch/nox/entry1     |  7 +++++++
 distro/gloriousarch/nox/install.sh | 11 +++++++++++
 distro/gloriousarch/nox/isoinfo    |  9 +++++++++
 distro/gloriousarch/xfce/entry1    |  2 +-
 distro/gloriousarch/xfce/isoinfo   |  4 ++--
 7 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 distro/gloriousarch/nox/entry1
 create mode 100644 distro/gloriousarch/nox/install.sh
 create mode 100644 distro/gloriousarch/nox/isoinfo

diff --git a/distro/gloriousarch/mate/entry1 b/distro/gloriousarch/mate/entry1
index 188a3b7..d9bfd03 100644
--- a/distro/gloriousarch/mate/entry1
+++ b/distro/gloriousarch/mate/entry1
@@ -3,5 +3,5 @@ _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"
+OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/$_name iomem=relaxed"
 X64=y
diff --git a/distro/gloriousarch/mate/isoinfo b/distro/gloriousarch/mate/isoinfo
index 8ca25c4..605d6a4 100644
--- a/distro/gloriousarch/mate/isoinfo
+++ b/distro/gloriousarch/mate/isoinfo
@@ -1,8 +1,8 @@
-_isodate=2018-01-06
+_isodate=2018-01-25
 _desktop=mate
 ISONAME="$DISTRONAME $_desktop $_isodate"
 ISOURL=garch-$_desktop-$_isodate.iso
-SHA256=2b830d2b3521c11a1802041f23cbf7cd926a4a89c7e541c541f8ff45a90a9bd7
+SHA256=c57fcddb431f6f6b490256603596f4ce57057d4932c4b3c194abe8969f1e3289
 
 mirrorlist=(
 https://sourceforge.net/projects/garchiso/files
diff --git a/distro/gloriousarch/nox/entry1 b/distro/gloriousarch/nox/entry1
new file mode 100644
index 0000000..07dcc75
--- /dev/null
+++ b/distro/gloriousarch/nox/entry1
@@ -0,0 +1,7 @@
+TITLE='Glorious Arch x86_64'
+_name=garch/nox
+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 iomem=relaxed"
+X64=y
diff --git a/distro/gloriousarch/nox/install.sh b/distro/gloriousarch/nox/install.sh
new file mode 100644
index 0000000..6992842
--- /dev/null
+++ b/distro/gloriousarch/nox/install.sh
@@ -0,0 +1,11 @@
+_name=garch/nox
+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/nox/isoinfo b/distro/gloriousarch/nox/isoinfo
new file mode 100644
index 0000000..5eee2ff
--- /dev/null
+++ b/distro/gloriousarch/nox/isoinfo
@@ -0,0 +1,9 @@
+_isodate=2018-01-25
+_desktop=nox
+ISONAME="$DISTRONAME $_desktop $_isodate"
+ISOURL=garch-$_desktop-$_isodate.iso
+SHA256=d1f98302572e69866d1acd98784db749117bdb66700199a69bc9dcc4bc110cfa
+
+mirrorlist=(
+https://sourceforge.net/projects/garchiso/files
+)
diff --git a/distro/gloriousarch/xfce/entry1 b/distro/gloriousarch/xfce/entry1
index 6cabe21..aa279ab 100644
--- a/distro/gloriousarch/xfce/entry1
+++ b/distro/gloriousarch/xfce/entry1
@@ -3,5 +3,5 @@ _name=garch/xfce
 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"
+OPTION="archisodevice=/dev/disk/by-uuid/$UUID archisobasedir=liveusb-data/$_name iomem=relaxed"
 X64=y
diff --git a/distro/gloriousarch/xfce/isoinfo b/distro/gloriousarch/xfce/isoinfo
index 1a93037..689b98f 100644
--- a/distro/gloriousarch/xfce/isoinfo
+++ b/distro/gloriousarch/xfce/isoinfo
@@ -1,8 +1,8 @@
-_isodate=2018-01-06
+_isodate=2018-01-25
 _desktop=xfce
 ISONAME="$DISTRONAME $_desktop $_isodate"
 ISOURL=garch-$_desktop-$_isodate.iso
-SHA256=6221d8863c74843f61c65f58b6a16baaa7f85a41fec79d4e9a40a9d4fafef4c0
+SHA256=9062baf4998a1a5ee9aa4c2989b7f516c2bbc810c2afaac175060363fcccc99f
 
 mirrorlist=(
 https://sourceforge.net/projects/garchiso/files
-- 
cgit v1.2.3