updated to 5.0.1

Removed all no longer supported boot disks and tried to fix ntpasswd boot, but not tested it yet.

3 files changed, 9 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index af52587a9831..f466897891ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = systemrescuecd
 	pkgdesc = Installs a rescue system into the boot partition to allow grub to boot it.
-	pkgver = 4.9.5
+	pkgver = 5.0.1
 	pkgrel = 1
 	url = http://www.sysresccd.org
 	install = systemrescuecd.install
@@ -9,13 +9,13 @@ pkgbase = systemrescuecd
 	license = GPL
 	makedepends = p7zip
 	depends = grub>=2.00
-	noextract = systemrescuecd-x86-4.9.5.iso
+	noextract = systemrescuecd-x86-5.0.1.iso
 	backup = etc/default/systemrescuecd
-	source = http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/4.9.5/systemrescuecd-x86-4.9.5.iso
+	source = http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/5.0.1/systemrescuecd-x86-5.0.1.iso
 	source = 25_systemrescuecd
 	source = systemrescuecd
-	md5sums = 4e76483f3aff8e44d76e26ad2fd027f8
-	md5sums = e8a3f16ee5208a0be0742d9995295187
+	md5sums = ba26eabb079705e1aca1272429f12999
+	md5sums = 6b717dcaa4e6e79801b7b257ddf6e910
 	md5sums = 9cef18f521312ca5c5d505f6619bd183
 
 pkgname = systemrescuecd
diff --git a/25_systemrescuecd b/25_systemrescuecd
index 9a74ee7c9914..ba799b8c2c1a 100755
--- a/25_systemrescuecd
+++ b/25_systemrescuecd
@@ -29,39 +29,13 @@ menuentry "System Rescue (i586) in Memory" {
   initrd ${BASE_DIR}/sysrescue/initram.igz
 }
 
-menuentry "System Rescue (alternative x86_64)" {
-  linux ${BASE_DIR}/sysrescue/altker64 subdir=${BASE_DIR}/sysrescue ${CUSTOM_BOOTOPTIONS}
-  initrd ${BASE_DIR}/sysrescue/initram.igz
-}
-
-menuentry "System Rescue (alternative x86_64) in Memory" {
-  linux ${BASE_DIR}/sysrescue/altker64 subdir=${BASE_DIR}/sysrescue docache ${CUSTOM_BOOTOPTIONS}
-  initrd ${BASE_DIR}/sysrescue/initram.igz
-}
-
-menuentry "System Rescue (alternative i586)" {
-  linux ${BASE_DIR}/sysrescue/altker32 subdir=${BASE_DIR}/sysrescue ${CUSTOM_BOOTOPTIONS}
-  initrd ${BASE_DIR}/sysrescue/initram.igz
-}
-
-menuentry "System Rescue (alternative i586) in Memory" {
-  linux ${BASE_DIR}/sysrescue/altker32 subdir=${BASE_DIR}/sysrescue docache ${CUSTOM_BOOTOPTIONS}
-  initrd ${BASE_DIR}/sysrescue/initram.igz
-}
-
 menuentry "MemTest+" {
   linux16 ${BASE_DIR}/sysrescue/bootdisk/memtestp
 }
 
 menuentry "NT Password Editor" {
-  linux ${BASE_DIR}/sysrescue/ntpasswd/vmlinuz
+  linux ${BASE_DIR}/sysrescue/ntpasswd/vmlinuz initrd=/${BASE_DIR}/sysrescue/ntpasswd/scsi.cgz
   initrd ${BASE_DIR}/sysrescue/ntpasswd/initrd.cgz
-# initrd ${BASE_DIR}/sysrescue/ntpasswd/scsi.cgz
-}
-
-menuentry "Super Grub2 Disk" {
-  linux16 ${BASE_DIR}/sysrescue/memdisk raw floppy
-  initrd16 ${BASE_DIR}/sysrescue/bootdisk/grubdisk.img
 }
 
 menuentry "FreeDOS" {
@@ -78,20 +52,6 @@ menuentry "HDT - Hardware Diagnostic Tool (recent)" {
   initrd16 ${BASE_DIR}/sysrescue/bootdisk/hdt.img
 }
 
-menuentry "Aida - Hardware Diagnostic Tool (old)" {
-  linux16 ${BASE_DIR}/sysrescue/memdisk floppy
-  initrd16 ${BASE_DIR}/sysrescue/bootdisk/aida.img
-}
-
-menuentry "GAG - Graphical Boot Manager" {
-  linux16 ${BASE_DIR}/sysrescue/memdisk floppy
-  initrd16 ${BASE_DIR}/sysrescue/bootdisk/gag.img
-}
-
-menuentry "DBAN - Erase all data" {
-  linux ${BASE_DIR}/sysrescue/bootdisk/dban.bzi nuke="dwipe" silent
-}
-
 menuentry "MHDD - Low-level Hard Drive diagnostic tool" {
   linux16 ${BASE_DIR}/sysrescue/memdisk floppy
   initrd16 ${BASE_DIR}/sysrescue/bootdisk/mhdd.img
diff --git a/PKGBUILD b/PKGBUILD
index 6253cd258d9e..027af978545b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: PyroDevil <p dot devil at gmail dot com>
 pkgname=systemrescuecd
-pkgver=4.9.5
+pkgver=5.0.1
 pkgrel=1
 epoch=
 pkgdesc="Installs a rescue system into the boot partition to allow grub to boot it."
@@ -22,8 +22,8 @@ changelog=
 source=("http://downloads.sourceforge.net/project/systemrescuecd/sysresccd-x86/$pkgver/$pkgname-x86-$pkgver.iso"
         "25_systemrescuecd"
         "systemrescuecd")
-md5sums=('4e76483f3aff8e44d76e26ad2fd027f8'
-         'e8a3f16ee5208a0be0742d9995295187'
+md5sums=('ba26eabb079705e1aca1272429f12999'
+         '6b717dcaa4e6e79801b7b257ddf6e910'
          '9cef18f521312ca5c5d505f6619bd183')
 noextract=("$pkgname-x86-$pkgver.iso")
 backup=("etc/default/systemrescuecd")
@@ -43,17 +43,11 @@ package() {
   install -m 644 "$srcdir/systemrescuecd"                         "$pkgdir/etc/default/"
   install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/rescue32"     "$pkgdir/boot/sysrescue/"
   install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/rescue64"     "$pkgdir/boot/sysrescue/"
-  install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/altker32"     "$pkgdir/boot/sysrescue/"
-  install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/altker64"     "$pkgdir/boot/sysrescue/"
   install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/initram.igz"  "$pkgdir/boot/sysrescue/"
   install -m 644 "$srcdir/$pkgname-$pkgver/sysrcd.dat"            "$pkgdir/boot/sysrescue/"
   install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/memdisk"      "$pkgdir/boot/sysrescue/"
   install -m 644 "$srcdir/$pkgname-$pkgver/isolinux/netboot"      "$pkgdir/boot/sysrescue/"
-  install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/aida.img"     "$pkgdir/boot/sysrescue/bootdisk"
-  install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/dban.bzi"     "$pkgdir/boot/sysrescue/bootdisk"
   install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/freedos.img"  "$pkgdir/boot/sysrescue/bootdisk"
-  install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/gag.img"      "$pkgdir/boot/sysrescue/bootdisk"
-  install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/grubdisk.img" "$pkgdir/boot/sysrescue/bootdisk"
   install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/hdt.img"      "$pkgdir/boot/sysrescue/bootdisk"
   install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/memtestp"     "$pkgdir/boot/sysrescue/bootdisk"
   install -m 644 "$srcdir/$pkgname-$pkgver/bootdisk/mhdd.img"     "$pkgdir/boot/sysrescue/bootdisk"