From 97242a1b52c3450240c1e6f6024e748b48c2b170 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 21 Dec 2014 13:26:45 +0100 Subject: [PATCH] 10filesystem: support for /dev/vd* devices as swap --- postplug.d/10filesystems | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postplug.d/10filesystems b/postplug.d/10filesystems index 0279d60..ec6f449 100644 --- a/postplug.d/10filesystems +++ b/postplug.d/10filesystems @@ -165,7 +165,7 @@ let "swapon = 0" [[ "$FS_PARTS_MOUNT" = "yes" ]] && AUTO_ADD="" || AUTO_ADD="noauto," [[ "$FS_PARTS_UPDATE" != "yes" && "$FS_SWAP_UPDATE" != "yes" ]] || -blkid | grep /dev/sd | while read line; do +blkid | while read line; do unset dev uuid devline devfstype TYPE UUID LABEL dev=${line/:*} devline=${line/*:} @@ -197,7 +197,9 @@ blkid | grep /dev/sd | while read line; do [ "$FS_FLOPPY_UPDATE" = "yes" ] || continue mount_point=$(get_new_mp_name floppy) ;; - /dev/cdrom[0-9]*) # CDROM devices + /dev/sr[0-9]*|\ + /dev/cdrom[0-9]*) + # CDROM devices [ "$FS_CDROM_UPDATE" = "yes" ] || continue # check if the CD is already mounted devfs="$(readlink -f $dev)" @@ -213,7 +215,9 @@ blkid | grep /dev/sd | while read line; do mount_point=$(get_new_mp_name cdrom) ;; /dev/sd[a-z][0-9]*|\ + /dev/vd[a-z][0-9]*|\ /dev/hd[a-z][0-9]*|\ + /dev/mmcblk[0-9]*p[0-9]*|\ /dev/ub[a-z][0-9]*|\ /dev/ub/[a-z]*/part[0-9]*) ## if an USB device is detected add the 'sync' option