update parabola

16 files changed, 34 insertions, 45 deletions

diff --git a/distro/parabola/32/entry b/distro/parabola/32/entry
new file mode 100644
index 0000000..e4a3e17
--- /dev/null
+++ b/distro/parabola/32/entry
@@ -0,0 +1,3 @@
+ARCH=i686
+X64=n
+source distro/parabola/entry
diff --git a/distro/parabola/32/install.sh b/distro/parabola/32/install.sh
new file mode 100644
index 0000000..818db2e
--- /dev/null
+++ b/distro/parabola/32/install.sh
@@ -0,0 +1,2 @@
+ARCH=i686
+source distro/parabola/install.sh
diff --git a/distro/parabola/32/isoinfo b/distro/parabola/32/isoinfo
new file mode 100644
index 0000000..aa4be62
--- /dev/null
+++ b/distro/parabola/32/isoinfo
@@ -0,0 +1,5 @@
+_isodate=2018.06.11
+_arch=i686
+SHA512=3c601620913b83d143f876466765841968d36518e5638ceebefd835164f30d4a5b4a282546fe0ac9ba2f2a1186f754e7b1cd29cb31faa0c8cea6a009d2ecc630
+
+source distro/parabola/isoinfo.common
diff --git a/distro/parabola/64/entry b/distro/parabola/64/entry
new file mode 100644
index 0000000..820ceee
--- /dev/null
+++ b/distro/parabola/64/entry
@@ -0,0 +1,3 @@
+ARCH=x86_64
+X64=y
+source distro/parabola/entry
diff --git a/distro/parabola/64/install.sh b/distro/parabola/64/install.sh
new file mode 100644
index 0000000..62c5344
--- /dev/null
+++ b/distro/parabola/64/install.sh
@@ -0,0 +1,2 @@
+ARCH=x86_64
+source distro/parabola/install.sh
diff --git a/distro/parabola/64/isoinfo b/distro/parabola/64/isoinfo
new file mode 100644
index 0000000..0b5fe7b
--- /dev/null
+++ b/distro/parabola/64/isoinfo
@@ -0,0 +1,5 @@
+_isodate=2018.06.11
+_arch=x86_64
+SHA512=0af995c407bf27a3ef040681fe1493a626edde7034a2ef4bf14d1da51ec5db5bd6dcfc13670d735affcae00853517b36c9e35fd8fb86535d79afd84807dabe33
+
+source distro/parabola/isoinfo.common
diff --git a/distro/parabola/entry b/distro/parabola/entry
new file mode 100644
index 0000000..a9ea9d8
--- /dev/null
+++ b/distro/parabola/entry
@@ -0,0 +1,4 @@
+TITLE="Parabola GNU/Linux-libre $ARCH"
+KERNEL="/liveusb-kernel/parabola/$ARCH/vmlinuz"
+INITRD="/liveusb-kernel/parabola/$ARCH/parabolaiso.img"
+OPTION="parabolaisodevice=/dev/disk/by-uuid/$UUID parabolaisobasedir=liveusb-data/parabola"
diff --git a/distro/parabola/entry1 b/distro/parabola/entry1
deleted file mode 100644
index cbb2613..0000000
--- a/distro/parabola/entry1
+++ /dev/null
@@ -1,5 +0,0 @@
-TITLE='Parabola GNU/Linux-libre x86_64'
-KERNEL=/liveusb-kernel/parabola/x86_64/vmlinuz
-INITRD=/liveusb-kernel/parabola/x86_64/parabolaiso.img
-OPTION="parabolaisodevice=/dev/disk/by-uuid/$UUID parabolaisobasedir=liveusb-data/parabola"
-X64=y
diff --git a/distro/parabola/entry2 b/distro/parabola/entry2
deleted file mode 100644
index d009224..0000000
--- a/distro/parabola/entry2
+++ /dev/null
@@ -1,5 +0,0 @@
-TITLE='Parabola GNU/Linux-libre i686'
-KERNEL=/liveusb-kernel/parabola/i686/vmlinuz
-INITRD=/liveusb-kernel/parabola/i686/parabolaiso.img
-OPTION="parabolaisodevice=/dev/disk/by-uuid/$UUID parabolaisobasedir=liveusb-data/parabola"
-X64=n
diff --git a/distro/parabola/install.sh b/distro/parabola/install.sh
index eab85ec..736524a 100644
--- a/distro/parabola/install.sh
+++ b/distro/parabola/install.sh
@@ -1,9 +1,9 @@
 install_live() {
 	mount_iso
 	install -d "$DATADIR/parabola"
-	cp -r "$ISOMNT/parabola/"{i686,x86_64,checksum*,pkglist*,aitab} "$DATADIR/parabola/"
+	cp -r "$ISOMNT/parabola/"{$ARCH,checksum*,pkglist*,aitab} "$DATADIR/parabola/"
 	install -d "$KERNELDIR/parabola"
-	cp -r "$ISOMNT/parabola/boot/"{i686,x86_64} "$KERNELDIR/parabola/"
+	cp -r "$ISOMNT/parabola/boot/$ARCH" "$KERNELDIR/parabola/"
 	umount_iso
 }
 
diff --git a/distro/parabola/isoinfo b/distro/parabola/isoinfo
deleted file mode 100644
index b94648f..0000000
--- a/distro/parabola/isoinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-_isodate=2016.11.03
-ISONAME="$DISTRONAME $_isodate"
-ISOURL="iso/${_isodate}/parabola-${_isodate}-dual.iso"
-SHA512=8a532517d1ed08b6f198f5593821d60a12fc87c5671f855bdda5776a85c9a12d7480668b1f8ca7263f991f53dcda5243f3a27da627ae5affc5312f942e395ad3
-
-mirrorlist=(
-https://repo.parabola.nu
-http://mirror.yandex.ru/mirrors/parabola
-http://parabolagnulinux.mirrors.linux.ro
-)
diff --git a/distro/parabola/isoinfo.common b/distro/parabola/isoinfo.common
new file mode 100644
index 0000000..3157067
--- /dev/null
+++ b/distro/parabola/isoinfo.common
@@ -0,0 +1,8 @@
+ISONAME="$DISTRONAME $_isodate"
+ISOURL="iso/openrc-cli-${_isodate}/parabola-openrc-cli-${_arch}-netinstall-${_isodate}.iso"
+
+mirrorlist=(
+https://repomirror.parabola.nu
+http://mirror.yandex.ru/mirrors/parabola
+http://parabolagnulinux.mirrors.linux.ro
+)
diff --git a/distro/parabola/mate/entry1 b/distro/parabola/mate/entry1
deleted file mode 100644
index 99d6037..0000000
--- a/distro/parabola/mate/entry1
+++ /dev/null
@@ -1,5 +0,0 @@
-TITLE='Parabola GNU/Linux-libre MATE x86_64'
-KERNEL=/liveusb-kernel/parabola/x86_64/vmlinuz
-INITRD=/liveusb-kernel/parabola/x86_64/parabolaiso.img
-OPTION="parabolaisodevice=/dev/disk/by-uuid/$UUID parabolaisobasedir=liveusb-data/parabola/mate"
-X64=y
diff --git a/distro/parabola/mate/entry2 b/distro/parabola/mate/entry2
deleted file mode 100644
index 7863e4d..0000000
--- a/distro/parabola/mate/entry2
+++ /dev/null
@@ -1,5 +0,0 @@
-TITLE='Parabola GNU/Linux-libre MATE i686'
-KERNEL=/liveusb-kernel/parabola/i686/vmlinuz
-INITRD=/liveusb-kernel/parabola/i686/parabolaiso.img
-OPTION="parabolaisodevice=/dev/disk/by-uuid/$UUID parabolaisobasedir=liveusb-data/parabola/mate"
-X64=n
diff --git a/distro/parabola/mate/install.sh b/distro/parabola/mate/install.sh
deleted file mode 100644
index ef38b6f..0000000
--- a/distro/parabola/mate/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-install_live() {
-	mount_iso
-	install -d "$KERNELDIR/parabola" "$DATADIR/parabola/mate"
-	cp -r "$ISOMNT/parabola/"{i686,x86_64,checksum*,pkglist*,aitab} "$DATADIR/parabola/mate"
-	cp -r "$ISOMNT/parabola/boot/"{i686,x86_64} "$KERNELDIR/parabola/"
-	umount_iso
-}
-
diff --git a/distro/parabola/mate/isoinfo b/distro/parabola/mate/isoinfo
deleted file mode 100644
index c86290b..0000000
--- a/distro/parabola/mate/isoinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-# same _isodate, mirrorlist
-source distro/parabola/isoinfo
-ISONAME="$DISTRONAME MATE $_isodate"
-ISOURL="iso/mate-${_isodate}/parabola-mate-${_isodate}-dual.iso"
-SHA512=1fb8600398d5c21da41bcddb6e1a492e4383117c5e27e2434e9f69222a3a62b0dd062b0cbc0058f31edb6d205e08bc46c21f1ac9dc731d42ed9218b5e3918fce