From b09e57e56f676a51e1df814129b8c4795e748b71 Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Sun, 1 Apr 2018 23:56:32 +0200
Subject: [PATCH] noimage_format

---
 hooks/cow_device                                   |  6 +++---
 .../archiso-x86_64-cd-default_noimage-format.conf  |  5 +++++
 .../archiso-x86_64-usb-default_noimage-format.conf |  5 +++++
 syslinux-standart.cfg                              |  7 +++++++
 syslinux.cfg                                       | 14 ++++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100755 releng/archiso-x86_64-cd-default_noimage-format.conf
 create mode 100755 releng/archiso-x86_64-usb-default_noimage-format.conf

diff --git a/hooks/cow_device b/hooks/cow_device
index 7808faf..78eda7d 100755
--- a/hooks/cow_device
+++ b/hooks/cow_device
@@ -5,8 +5,8 @@ run_hook ()
     if [[ "${format}" == "y" ]]; then
         sfdisk -l
 
-        read -p "Welches Laufwerk soll eine cow_device erhalten? /dev/sda : " formatdevice
         [[ -z "${formatdevice}" ]] && formatdevice=/dev/sda
+        [[ -z "${formatpartition}" ]] && formatpartition=3
 
         fdisk ${formatdevice} <<EOT
 p
@@ -19,9 +19,9 @@ p
 w
 EOT
         
-        mkfs.btrfs -f -L cow_device ${formatdevice}3
+        mkfs.btrfs -f -L cow_device ${formatdevice}${formatpartition}
 
-        launch_interactive_shell
+        reboot -f
     fi
 
 }
diff --git a/releng/archiso-x86_64-cd-default_noimage-format.conf b/releng/archiso-x86_64-cd-default_noimage-format.conf
new file mode 100755
index 0000000..683e236
--- /dev/null
+++ b/releng/archiso-x86_64-cd-default_noimage-format.conf
@@ -0,0 +1,5 @@
+# noimage format
+title   %ISO_LABEL% %arch% UEFI DVD NOIMAGE FORMAT
+linux   /EFI/archiso/vmlinuz.efi
+initrd  /EFI/archiso/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M format=y formatdevice=/dev/sda formatpartition=3
diff --git a/releng/archiso-x86_64-usb-default_noimage-format.conf b/releng/archiso-x86_64-usb-default_noimage-format.conf
new file mode 100755
index 0000000..c90765c
--- /dev/null
+++ b/releng/archiso-x86_64-usb-default_noimage-format.conf
@@ -0,0 +1,5 @@
+# noimage format
+title   %ISO_LABEL% %arch% UEFI USB NOIMAGE FORMAT
+linux   /%INSTALL_DIR%/boot/%arch%/vmlinuz
+initrd  /%INSTALL_DIR%/boot/%arch%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ISO_LABEL% cow_spacesize=1024M format=y formatdevice=/dev/sda formatpartition=3
diff --git a/syslinux-standart.cfg b/syslinux-standart.cfg
index 6e33be8..647bdcd 100755
--- a/syslinux-standart.cfg
+++ b/syslinux-standart.cfg
@@ -26,6 +26,13 @@ LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
 APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash
 
+# default noimage format
+LABEL arch
+MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE FORMAT
+LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz
+INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
+APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3
+
 # default nvidia
 LABEL arch
 MENU LABEL %ISO_LABEL% DEFAULT NVIDIA
diff --git a/syslinux.cfg b/syslinux.cfg
index 33cdebf..32ea6f8 100755
--- a/syslinux.cfg
+++ b/syslinux.cfg
@@ -75,6 +75,20 @@ LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz
 INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
 APPEND archisolabel=%ISO_LABEL% cow_label=cow_device copytoram=y quiet splash
 
+# default noimage format
+LABEL arch
+MENU LABEL %ISO_LABEL% DEFAULT NOIMAGE FORMAT
+LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz
+INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
+APPEND archisolabel=%ISO_LABEL% format=y formatdevice=/dev/sda formatpartition=3
+
+# default nvidia
+LABEL arch
+MENU LABEL %ISO_LABEL% DEFAULT NVIDIA
+LINUX /%INSTALL_DIR%/boot/%arch%/vmlinuz
+INITRD /%INSTALL_DIR%/boot/%arch%/archiso.img
+APPEND archisolabel=%ISO_LABEL% cow_spacesize=1024M nvidia-drm.modeset=1 nvidia=y quiet splash
+
 # default checksum
 LABEL arch
 MENU LABEL %ISO_LABEL% DEFAULT Check disc for defects