brain-hackers_pepepper-mirror/brain-config
1
0
Fork 0
mirror of https://github.com/brain-hackers/brain-config.git synced 2024-12-22 20:20:06 +09:00
Code Issues Projects Releases Wiki Activity

make expand_rootfs work even if root is not /dev/mmcblk0p2

Browse Source 
The tool is still very cautious as to when it will work. Refuses to work if
/dev/root is not /dev/mmcblk0*
This commit is contained in:
Alex Bradbury 2013-05-20 19:45:01 +01:00
parent b3c45a04f5
commit 9a05d5c295
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
raspi-config
View File

@ -16,18 +16,37 @@ you have heavily customised your installation.\
} }
do_expand_rootfs() { do_expand_rootfs() {
if ! [ -h /dev/root ]; then
whiptail --msgbox "/dev/root does not exist or is not a symlink. Don't know how to expand" 20 60 2
return 0
fi
ROOT_PART=$(readlink /dev/root)
PART_NUM=${ROOT_PART#mmcblk0p}
if [ "$PART_NUM" = "$ROOT_PART" ]; then
whiptail --msgbox "/dev/root is not an SD card. Don't know how to expand" 20 60 2
return 0
fi
LAST_PART_NUM=$(parted /dev/mmcblk0 -ms unit s p | tail -n 1 | cut -f 1 -d:)
if [ "$LAST_PART_NUM" != "$PART_NUM" ]; then
whiptail --msgbox "/dev/root is not the last partition. Don't know how to expand" 20 60 2
return 0
fi
# Get the starting offset of the root partition # Get the starting offset of the root partition
PART_START=$(parted /dev/mmcblk0 -ms unit s p | grep "^2" | cut -f 2 -d:) PART_START=$(parted /dev/mmcblk0 -ms unit s p | grep "^${PART_NUM}" | cut -f 2 -d:)
[ "$PART_START" ] || return 1 [ "$PART_START" ] || return 1
# Return value will likely be error for fdisk as it fails to reload the # Return value will likely be error for fdisk as it fails to reload the
# partition table because the root fs is mounted # partition table because the root fs is mounted
fdisk /dev/mmcblk0 <<EOF fdisk /dev/mmcblk0 <<EOF
p p
d d
2 $PART_NUM
n n
p p
2 $PART_NUM
$PART_START $PART_START
p p
@ -53,7 +72,7 @@ cat <<\EOF > /etc/init.d/resize2fs_once &&
case "$1" in case "$1" in
start) start)
log_daemon_msg "Starting resize2fs_once" && log_daemon_msg "Starting resize2fs_once" &&
resize2fs /dev/mmcblk0p2 && resize2fs /dev/root &&
rm /etc/init.d/resize2fs_once && rm /etc/init.d/resize2fs_once &&
update-rc.d resize2fs_once remove && update-rc.d resize2fs_once remove &&
log_end_msg $? log_end_msg $?