projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch from vol_id to blkid if using udev >=146-1 (Closes: #555529).
[live-boot-grml.git]
/
scripts
/
live-bottom
/
12fstab
diff --git
a/scripts/live-bottom/12fstab
b/scripts/live-bottom/12fstab
index
be78e77
..
b2f187c
100755
(executable)
--- a/
scripts/live-bottom/12fstab
+++ b/
scripts/live-bottom/12fstab
@@
-66,7
+66,10
@@
then
continue
fi
continue
fi
- /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
+ if [ -x /lib/udev/vol_id ]
+ then
+ /lib/udev/vol_id ${device%%[0-9]*} 2>/dev/null | grep -q "^ID_FS_USAGE=raid" && continue
+ fi
magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
magic=$(/bin/dd if="${device}" bs=4086 skip=1 count=1 2>/dev/null | /bin/dd bs=10 count=1 2>/dev/null) || continue
@@
-77,12
+80,17
@@
then
fi
done
fi
done
+ # Remove all auto swap entries
+ if grep -qs "swap swap" "${FSTAB}"
+ then
+ grep -v "swap swap" "${FSTAB}" > "${FSTAB}".tmp
+ mv "${FSTAB}".tmp "${FSTAB}"
+ fi
+
+ # Add new swap entries
for device in ${devices}
do
for device in ${devices}
do
- if ! grep -qs "^${device} swap" "${FSTAB}"
- then
- echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
- fi
+ echo "${device} swap swap defaults 0 0" >> "${FSTAB}"
done
fi
done
fi