From 007f07456f49f43a31c3f5c2f4c4eeffbc18a74d Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Fri, 4 May 2012 17:33:34 +0000
Subject: we dont use halt.pre anymore

---
 config/live.cfg |  4 ----
 files/halt.pre  | 20 --------------------
 2 files changed, 24 deletions(-)
 delete mode 100644 files/halt.pre

diff --git a/config/live.cfg b/config/live.cfg
index da35792..8a42e9c 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -49,10 +49,6 @@ my $_l = {
                 #- do not load usblp and trigger autosetupprintqueues in live since cups is not available
                 [ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
             ),
-            if_($live->{settings}{media} ne 'usb', #- FIXME
-                #- umount tmp rpm hack before /etc/init.d/halt tries and fails
-                [ 'files/halt.pre', '/sbin/halt.pre', { mode => 0755 } ],
-            ),
             #- disable first boot wizard at live boot
             [ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],
             #- enable drakx-finish-install at live boot
diff --git a/files/halt.pre b/files/halt.pre
deleted file mode 100644
index 8b2583e..0000000
--- a/files/halt.pre
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-mypath=$_
-roottype=`awk '$2 == "/" { print $3 }' /etc/fstab`
-
-maybe_umount() {
-    eval d=\$$#
-    awk "\$2 == \"$d\" { system(\"umount \" \$d) }" /proc/mounts 
-}
-
-if [ "$roottype" == unionfs ]; then
-    maybe_umount /var/lib/rpm
-    maybe_umount /tmp/rpm/real
-    maybe_umount /tmp/rpm
-fi
-
-# disable self during first halt when installed
-rm -f $mypath
-
-/bin/plymouth quit
-- 
cgit v1.2.1