From d05255480af23d2c14c49494954ab84a642c3b8f Mon Sep 17 00:00:00 2001
From: Andreas Loibl <andreas@andreas-loibl.de>
Date: Fri, 18 May 2012 02:27:23 +0200
Subject: remove enable_persistent script, mdadm raid support
---
backend/modules/install_configure | 1 +
backend/modules/partitions | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/backend/modules/install_configure b/backend/modules/install_configure
index e66925d..a78d576 100644
--- a/backend/modules/install_configure
+++ b/backend/modules/install_configure
@@ -165,5 +165,6 @@ function configure_target_purge_live_only_stuff()
$TARGET/usr/share/initramfs-tools/scripts/live-bottom/03rpmfirmware
rm -rvf $TARGET/lib/live
rm -vf $TARGET/etc/profile.d/zz-live.sh
+ rm -vf $TARGET/usr/local/bin/enable_persistent_live.bash
}
diff --git a/backend/modules/partitions b/backend/modules/partitions
index a64306a..87fa80b 100644
--- a/backend/modules/partitions
+++ b/backend/modules/partitions
@@ -19,7 +19,7 @@ function strip_live_media()
function list_all_disks()
{
(
- awk -vli="$(awk '{if($2=="sd") print $1;}' /proc/devices)" 'BEGIN{m=split(li,list," ")}{for(i=1;i<=m;i++) if($1==list[i]&&$2%16==0) print "/dev/"$4;}' /proc/partitions
+ awk -vli="$(awk '{if($2=="sd"||$2=="md") print $1;}' /proc/devices)" 'BEGIN{m=split(li,list," ")}{for(i=1;i<=m;i++) if(($1==list[i]&&$2%16==0)||($1==list[i]&&$2==126)) print "/dev/"$4;}' /proc/partitions
) | strip_live_media
}
@@ -48,7 +48,7 @@ function list_all_partitions()
{
(
awk -vli="$(awk '{if($2=="sd") print $1;}' /proc/devices)" 'BEGIN{m=split(li,list," ")}{for(i=1;i<=m;i++) if($1==list[i]&&$2%16!=0) print "/dev/"$4;}' /proc/partitions
- awk -vli="$(awk '{if($2=="md") print $1;}' /proc/devices)" 'BEGIN{m=split(li,list," ")}{for(i=1;i<=m;i++) if($1==list[i]) print "/dev/"$4;}' /proc/partitions
+ awk -vli="$(awk '{if($2=="md") print $1;}' /proc/devices)" 'BEGIN{m=split(li,list," ")}{for(i=1;i<=m;i++) if($1==list[i]||$1==list[i]+250) print "/dev/"$4;}' /proc/partitions
) | strip_live_media
}
--
cgit v1.0