distros/sysrescd: Converting to new directory structure.

4 files changed, 71 insertions, 20 deletions

diff --git a/src/distros/sysrescd/sysrescd.cfg b/src/distros/sysrescd/cfg.label.iso
index eb9ad4f..eb9ad4f 100644
--- a/src/distros/sysrescd/sysrescd.cfg
+++ b/src/distros/sysrescd/cfg.label.iso
diff --git a/src/distros/sysrescd/sysrescd.pxe.cfg b/src/distros/sysrescd/cfg.label.pxe
index c696b9a..c696b9a 100644
--- a/src/distros/sysrescd/sysrescd.pxe.cfg
+++ b/src/distros/sysrescd/cfg.label.pxe
diff --git a/src/distros/sysrescd/cfg.label.sys b/src/distros/sysrescd/cfg.label.sys
new file mode 100644
index 0000000..eb9ad4f
--- /dev/null
+++ b/src/distros/sysrescd/cfg.label.sys
@@ -0,0 +1,71 @@
+MENU BEGIN sysrescd
+MENU TITLE SystemRescueCD (@VERSION@)
+
+label rescue32
+    MENU LABEL SystemRescueCd (32bit):
+    MENU DISABLE
+
+label rescue32_1
+    MENU LABEL SystemRescueCd with default options
+    MENU INDENT 3
+    KERNEL /boot/sysrescd/vmlinuz.32
+    INITRD /boot/sysrescd/initram.igz
+    APPEND subdir=/boot/sysrescd/
+    TEXT HELP
+    Boot standard 32bit kernel with default options (should always work)
+    ENDTEXT
+
+label rescue32_2
+    MENU LABEL SystemRescueCd with all files cached to memory
+    MENU INDENT 3
+    KERNEL /boot/sysrescd/vmlinuz.32
+    INITRD /boot/sysrescd/initram.igz
+    APPEND docache subdir=/boot/sysrescd/
+    TEXT HELP
+    Boot standard 32bit kernel and run system from memory.
+    It requires 512 MB of memory to work and takes some time during the
+    boot process, but the cdrom can be removed and system will be faster.
+    ENDTEXT
+
+label rescue64
+    MENU LABEL SystemRescueCd (64bit):
+    MENU DISABLE
+
+label rescue64_1
+    MENU LABEL SystemRescueCd with default options
+    MENU INDENT 3
+    KERNEL /boot/sysrescd/vmlinuz.64
+    INITRD /boot/sysrescd/initram.igz
+    APPEND docache subdir=/boot/sysrescd/
+    TEXT HELP
+    Boot standard 64bit kernel with default options (should always work)
+    ENDTEXT
+
+label rescue64_2
+    MENU LABEL SystemRescueCd with all files cached to memory
+    MENU INDENT 3
+    KERNEL /boot/sysrescd/vmlinuz.64
+    INITRD /boot/sysrescd/initram.igz
+    APPEND docache subdir=/boot/sysrescd/
+    TEXT HELP
+    Boot standard 64bit kernel and run system from RAM (cdrom can be removed)
+    It requires 512 MB of memory to work and takes some time during the
+    boot process, but the cdrom can be removed and system will be faster.
+    ENDTEXT
+
+label rescuemisc
+    MENU LABEL SystemRescueCd Misc:
+    MENU DISABLE
+
+label ntpass
+    MENU LABEL NTPASSWD: Reset or edit Windows passwords
+    MENU INDENT 3
+    kernel /boot/sysrescd/vmlinuz.nt
+    append rw vga=1 initrd=/boot/sysrescd/initrd.cgz,/boot/sysrescd/scsi.cgz
+    TEXT HELP
+    This tool can be used to reset windows users accounts. It works with all
+    windows user accounts including the administrator. You can use this tool if
+    you forgot the administrator's password.
+    ENDTEXT
+
+MENU END
diff --git a/src/distros/sysrescd/make.boot b/src/distros/sysrescd/make.boot
index 04a4a4a..45e5639 100644
--- a/src/distros/sysrescd/make.boot
+++ b/src/distros/sysrescd/make.boot
@@ -1,7 +1,4 @@
 
-ISOLINUX_CFG            += $(CONFIGDIR)/sysrescd/@VERSION@/sysrescd.cfg
-PXELINUX_CFG            += $(CONFIGDIR)/sysrescd/@VERSION@/sysrescd.pxe.cfg
-SYSLINUX_CFG            += $(CONFIGDIR)/sysrescd/@VERSION@/sysrescd.cfg
 DOWNLOAD_FILES          += boot/sysrescd/@VERSION@/sysrcd.dat \
                            boot/sysrescd/@VERSION@/sysrcd.md5 \
                            boot/sysrescd/@VERSION@/vmlinuz.32 \
@@ -12,20 +9,6 @@ DOWNLOAD_FILES          += boot/sysrescd/@VERSION@/sysrcd.dat \
                            boot/sysrescd/@VERSION@/scsi.cgz
 
 
-$(CONFIGDIR)/sysrescd/@VERSION@/sysrescd.pxe.cfg: Makefile $(DISTRODIR)/sysrescd/sysrescd.pxe.cfg
-        @SRCFILE="$(DISTRODIR)/sysrescd/sysrescd.pxe.cfg"; \
-           DISTRO_CODENAME="@VERSION@"; \
-           DISTRO_VERSION="@VERSION@"; \
-           $(do_subst_dt)
-
-
-$(CONFIGDIR)/sysrescd/@VERSION@/sysrescd.cfg: Makefile $(DISTRODIR)/sysrescd/sysrescd.cfg
-        @SRCFILE="$(DISTRODIR)/sysrescd/sysrescd.cfg"; \
-           DISTRO_CODENAME="@VERSION@"; \
-           DISTRO_VERSION="@VERSION@"; \
-           $(do_subst_dt)
-
-
 tmp/boot/sysrescd/sysrescd-@VERSION@/.iperd-extracted:
         ./src/scripts/download.sh \
            -H $(SYSRESCD_HASHES)/sysrescd-@VERSION@.sha512 \
@@ -81,6 +64,3 @@ boot/sysrescd/@VERSION@/sysrcd.dat: tmp/boot/sysrescd/sysrescd-@VERSION@/.iperd-
         cp tmp/boot/sysrescd/sysrescd-@VERSION@/sysrcd.dat "$(@)"
         @touch "$(@)"
 
-
-#sysrescd: $(CONFIGDIR)/sysrescd.cfg boot/sysrescd/sysrescd.bin
-