Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bächler <thomas@archlinux.org>2010-10-17 18:59:46 +0200
committerThomas Bächler <thomas@archlinux.org>2010-10-17 18:59:46 +0200
commit21595371bb747108725ae55bfec85e001be46e49 (patch)
tree6d8ad9862b171acfecd1f057d05f28ef22e3ab8d
parent13c541e8a652063d811db5f8a7230ac7fc52b12c (diff)
Add new menu entry "Power off"
-rwxr-xr-xarchiso2dual/archiso2dual1
-rw-r--r--archiso2dual/syslinux.cfg4
-rw-r--r--configs/syslinux-iso/Makefile1
-rw-r--r--configs/syslinux-iso/boot-files/syslinux/syslinux.cfg4
4 files changed, 10 insertions, 0 deletions
diff --git a/archiso2dual/archiso2dual b/archiso2dual/archiso2dual
index 5b17b4a..c7dafee 100755
--- a/archiso2dual/archiso2dual
+++ b/archiso2dual/archiso2dual
@@ -51,6 +51,7 @@ syslinux_copy() {
echo "Executing: ${FUNCNAME}"
cp ${_v} $work_dir/i686/mnt/boot/{memtest*,releasenotes.txt,splash.png} $work_dir/iso/boot/
cp ${_v} $work_dir/i686/mnt/boot/syslinux/*.c32 $work_dir/iso/boot/syslinux/
+ cp ${_v} $work_dir/i686/mnt/boot/syslinux/poweroff.com $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/syslinux/memdisk $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/syslinux/isolinux.bin $work_dir/iso/boot/syslinux/
cp ${_v} $work_dir/i686/mnt/boot/syslinux/pxelinux.0 $work_dir/iso/boot/syslinux/
diff --git a/archiso2dual/syslinux.cfg b/archiso2dual/syslinux.cfg
index c32b9fd..e7f9bf6 100644
--- a/archiso2dual/syslinux.cfg
+++ b/archiso2dual/syslinux.cfg
@@ -77,4 +77,8 @@ LABEL reboot
MENU LABEL Reboot
KERNEL reboot.c32
+LABEL poweroff
+MENU LABEL Power Off
+KERNEL poweroff.com
+
ONTIMEOUT arch32
diff --git a/configs/syslinux-iso/Makefile b/configs/syslinux-iso/Makefile
index 3feb27f..0298004 100644
--- a/configs/syslinux-iso/Makefile
+++ b/configs/syslinux-iso/Makefile
@@ -42,6 +42,7 @@ bootfiles: root-image
cp $(WORKDIR)/root-image/usr/share/licenses/common/GPL2/license.txt $(WORKDIR)/iso/boot/memtest.COPYING
cp -r boot-files/* $(WORKDIR)/iso/boot/
cp $(WORKDIR)/root-image/usr/lib/syslinux/*.c32 $(WORKDIR)/iso/boot/syslinux/
+ cp $(WORKDIR)/root-image/usr/lib/syslinux/poweroff.com $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/isolinux.bin $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/memdisk $(WORKDIR)/iso/boot/syslinux/
cp $(WORKDIR)/root-image/usr/lib/syslinux/pxelinux.0 $(WORKDIR)/iso/boot/syslinux/
diff --git a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
index 57a63fc..0760e2e 100644
--- a/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
+++ b/configs/syslinux-iso/boot-files/syslinux/syslinux.cfg
@@ -66,4 +66,8 @@ LABEL reboot
MENU LABEL Reboot
KERNEL reboot.c32
+LABEL poweroff
+MENU LABEL Power Off
+KERNEL poweroff.com
+
ONTIMEOUT arch