Drop stage2_eltorito file

diff --git a/debian/copyright b/debian/copyright
index 50cb906..71c2f46 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,18 @@ Upstream Author: Michael Prokop <mika@grml.org>
 
 Copyright:
 
 
 Copyright:
 

-   This software is copyright (c) 2004-2005 by Michael Prokop.
+   grub/splash.xpm.gz and grub/grml.png: Copyright by Martin Ahammer / grml-team
+
+   images/: taken from asciidoc Debian package,
+            Copyright 2008 by Stuart Rackham <srackham@methods.co.nz>
+
+   lilo/: taken from the lilo Debian package, see lilo/COPYING for
+          licensing information
+
+   mbr/mbr.S: Copyright (c) 2009 Thorsten Glaser <tg@mirbsd.org>,
+              licensing information available in mbr/mbr.S
+
+   This software is copyright (c) 2009++ by Michael Prokop.

 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This package is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/debian/rules b/debian/rules
index 43d3a94..2b75c85 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,13 +37,10 @@ install: build
 
        # Add here commands to install the package into debian/grml2usb.
        install -m 755 grml2usb               debian/grml2usb/usr/sbin/grml2usb
 
        # Add here commands to install the package into debian/grml2usb.
        install -m 755 grml2usb               debian/grml2usb/usr/sbin/grml2usb

-       install -m 755 lilo/lilo.static.i386  debian/grml2usb//usr/share/grml2usb/lilo/lilo.static.i386
-       install -m 755 lilo/lilo.static.amd64 debian/grml2usb//usr/share/grml2usb/lilo/lilo.static.amd64
-       install -m 644 grub/splash.xpm.gz     debian/grml2usb/usr/share/grml2usb/grub/splash.xpm.gz
-       install -m 644 grub/stage2_eltorito   debian/grml2usb/usr/share/grml2usb/grub/stage2_eltorito
-       install -m 644 grub/grml.png          debian/grml2usb/usr/share/grml2usb/grub/grml.png

        install -m 644 mbr/mbrmgr             debian/grml2usb/usr/share/grml2usb/mbr/mbrmgr
        install -m 644 mbr/mbrldr             debian/grml2usb/usr/share/grml2usb/mbr/mbrldr
        install -m 644 mbr/mbrmgr             debian/grml2usb/usr/share/grml2usb/mbr/mbrmgr
        install -m 644 mbr/mbrldr             debian/grml2usb/usr/share/grml2usb/mbr/mbrldr

+       cp -a          lilo/                  debian/grml2usb/usr/share/grml2usb/
+       cp -a          grub/                  debian/grml2usb/usr/share/grml2usb/

 
 # Build architecture-dependent files here.
 binary-arch: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install

diff --git a/grml2usb b/grml2usb
index 2f9fb87..3bcaee8 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -1077,15 +1077,6 @@ def copy_bootloader_files(iso_mount, target):
                                 grub_target + 'ascii.pff'])
         proc.wait()
 
                                 grub_target + 'ascii.pff'])
         proc.wait()
 

-    if not os.path.isfile("/usr/share/grml2usb/grub/stage2_eltorito"):
-        logging.critical("Error: /usr/share/grml2usb/grub/stage2_eltorito can not be read.")
-        raise
-    else:
-        logging.debug("cp /usr/share/grml2usb/grub/stage2_eltorito to %s" % grub_target + 'stage2_eltorito')
-        proc = subprocess.Popen(["install", "--mode=664", '/usr/share/grml2usb/grub/stage2_eltorito',
-                                grub_target + 'stage2_eltorito'])
-        proc.wait()
-

 
 def install_iso_files(grml_flavour, iso_mount, device, target):
     """Copy files from ISO on given target"""
 
 def install_iso_files(grml_flavour, iso_mount, device, target):
     """Copy files from ISO on given target"""

diff --git a/grml2usb.8.txt b/grml2usb.8.txt
index f4cf9bf..d790eb4 100644 (file)
--- a/grml2usb.8.txt
+++ b/grml2usb.8.txt
@@ -186,7 +186,6 @@ Directory layout on usb device
     |   |-- grub.cfg         [configuration file for grub2]
     |   |-- menu.lst         [configuration file for grub1]
     |   |-- splash.xpm.gz    [splash screen for grub1]
     |   |-- grub.cfg         [configuration file for grub2]
     |   |-- menu.lst         [configuration file for grub1]
     |   |-- splash.xpm.gz    [splash screen for grub1]

-    |   `-- stage2_eltorito  [stage 2 loader for grub1]

     `-- syslinux/
         |-- boot.msg         [boot splash for syslinux]
         |-- f1               [screen when pressing f1]
     `-- syslinux/
         |-- boot.msg         [boot splash for syslinux]
         |-- f1               [screen when pressing f1]

diff --git a/grub/splash.xpm.gz b/grub/splash.xpm.gz
index 9c34906..cb88026 100644 (file)
Binary files a/grub/splash.xpm.gz and b/grub/splash.xpm.gz differ

diff --git a/grub/stage2_eltorito b/grub/stage2_eltorito
deleted file mode 100644 (file)
index a726b51..0000000
Binary files a/grub/stage2_eltorito and /dev/null differ