From 6bea4ae32e8c9391979d2fb2e2916822c829a723 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 20 Nov 2011 22:43:30 +0000
Subject: adapt for Mageia naming scheme
 (https://wiki.mageia.org/en/Product_naming)

---
 files/finish-install.CD    |  7 +++++++
 files/finish-install.cdrom |  7 -------
 files/halt.local.CD        | 25 +++++++++++++++++++++++++
 files/halt.local.cdrom     | 25 -------------------------
 files/live.modprobe.CD     |  1 +
 files/live.modprobe.cdrom  |  1 -
 6 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 files/finish-install.CD
 delete mode 100644 files/finish-install.cdrom
 create mode 100755 files/halt.local.CD
 delete mode 100755 files/halt.local.cdrom
 create mode 100644 files/live.modprobe.CD
 delete mode 100644 files/live.modprobe.cdrom

(limited to 'files')

diff --git a/files/finish-install.CD b/files/finish-install.CD
new file mode 100644
index 0000000..fed1dd5
--- /dev/null
+++ b/files/finish-install.CD
@@ -0,0 +1,7 @@
+FINISH_INSTALL=yes
+NETWORK=no
+URPMI=no
+AUTHENTICATION=no
+USERS=no
+TIMEZONE=simplified
+COUNTRY=simplified
diff --git a/files/finish-install.cdrom b/files/finish-install.cdrom
deleted file mode 100644
index fed1dd5..0000000
--- a/files/finish-install.cdrom
+++ /dev/null
@@ -1,7 +0,0 @@
-FINISH_INSTALL=yes
-NETWORK=no
-URPMI=no
-AUTHENTICATION=no
-USERS=no
-TIMEZONE=simplified
-COUNTRY=simplified
diff --git a/files/halt.local.CD b/files/halt.local.CD
new file mode 100755
index 0000000..1e9fc67
--- /dev/null
+++ b/files/halt.local.CD
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+use MDK::Common;
+use detect_devices;
+use c;
+
+my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!;
+$device or exit;
+
+system("chvt 1");
+
+# try to put halt/reboot in cache, if not called directly from them
+# mount is also needed by end of /etc/init.d/halt
+system("$_ --help &>/dev/null") foreach qw(halt mount reboot);
+
+my $f = detect_devices::tryOpen($device);
+# see openCdromTray() from install::any
+ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door
+ioctl($f, c::CDROMEJECT(), 0);
+
+print "\n\nPlease press <Enter> (or <CTRL><J>) once the medium is removed.\n";
+system("read < /dev/console");
+
+ioctl($f, c::CDROMCLOSETRAY(), 0);
diff --git a/files/halt.local.cdrom b/files/halt.local.cdrom
deleted file mode 100755
index 1e9fc67..0000000
--- a/files/halt.local.cdrom
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use MDK::Common;
-use detect_devices;
-use c;
-
-my ($device) = cat_("/proc/mounts") =~ m!(/dev/\S+)\s+/live/media\s+iso9660!;
-$device or exit;
-
-system("chvt 1");
-
-# try to put halt/reboot in cache, if not called directly from them
-# mount is also needed by end of /etc/init.d/halt
-system("$_ --help &>/dev/null") foreach qw(halt mount reboot);
-
-my $f = detect_devices::tryOpen($device);
-# see openCdromTray() from install::any
-ioctl($f, c::CDROM_LOCKDOOR(), 0); # unlock door
-ioctl($f, c::CDROMEJECT(), 0);
-
-print "\n\nPlease press <Enter> (or <CTRL><J>) once the medium is removed.\n";
-system("read < /dev/console");
-
-ioctl($f, c::CDROMCLOSETRAY(), 0);
diff --git a/files/live.modprobe.CD b/files/live.modprobe.CD
new file mode 100644
index 0000000..5bb2345
--- /dev/null
+++ b/files/live.modprobe.CD
@@ -0,0 +1 @@
+install usblp /bin/true
diff --git a/files/live.modprobe.cdrom b/files/live.modprobe.cdrom
deleted file mode 100644
index 5bb2345..0000000
--- a/files/live.modprobe.cdrom
+++ /dev/null
@@ -1 +0,0 @@
-install usblp /bin/true
-- 
cgit v1.2.1