Search
SailfishOS Open Build Service
>
Projects
>
nemo
:
devel:hw
:
x86:x86-common
>
installer-shell
> use-subvolrootid-and-subvol-insteadof-subvolid.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File use-subvolrootid-and-subvol-insteadof-subvolid.patch of Package installer-shell
diff -Naur a/installer-shell b/installer-shell --- a/installer-shell 2011-07-11 10:05:36.869805425 +0800 +++ b/installer-shell 2011-07-11 10:07:17.254109222 +0800 @@ -43,7 +43,6 @@ # Btrfs subvolume ID ROOTID= -HOMEID= # Liveimg(extlinux) or nandfs(kboot) IMAGE_TYPE="" @@ -704,7 +703,6 @@ dbglg_exec "btrfs subvol create $ROOTMNT/meego_root" dbglg_exec "btrfs subvol create $ROOTMNT/meego_home" ROOTID=$(btrfs subvol list $ROOTMNT | awk ' ($7 == "meego_root") { print $2 }') - HOMEID=$(btrfs subvol list $ROOTMNT | awk ' ($7 == "meego_home") { print $2 }') dbglg_exec "btrfs subvol set-default $ROOTID $ROOTMNT" persistent_umount $ROOTMNT @@ -785,8 +783,8 @@ # Attempt to mount the prepared partition using the given partition fs type dbglg "mount -t btrfs -o relatime,compress $ROOTDEV $ROOTMNT" mount_check "mount -t btrfs -o relatime,compress $ROOTDEV $ROOTMNT" - dbglg "mount -t btrfs -o relatime,compress,subvolid=$HOMEID $ROOTDEV $ROOTMNT/home" - mount_check "mount -t btrfs -o relatime,compress,subvolid=$HOMEID $ROOTDEV $ROOTMNT/home" + dbglg "mount -t btrfs -o relatime,compress,subvolrootid=0,subvol=meego_home $ROOTDEV $ROOTMNT/home" + mount_check "mount -t btrfs -o relatime,compress,subvolrootid=0,subvol=meego_home $ROOTDEV $ROOTMNT/home" if [ $IMAGE_TYPE = "liveimg" ]; then dbglg "mount -t ext3 $BOOTDEV $INSTALL_DIR/bootfs" mount_check "mount -t ext3 $BOOTDEV $INSTALL_DIR/bootfs" @@ -851,7 +849,7 @@ echo "$BOOTDEV /boot ext3 defaults 1 2" >> $FSTAB_FILE fi echo "$ROOTDEV / btrfs nodatasum,relatime,compress 1 1" >> $FSTAB_FILE - echo "$ROOTDEV /home btrfs nodatasum,relatime,compress,subvolid=$HOMEID 1 2" >> $FSTAB_FILE + echo "$ROOTDEV /home btrfs nodatasum,relatime,compress,subvolrootid=0,subvol=meego_home 1 2" >> $FSTAB_FILE echo "$SWAPDEV swap swap defaults 0 0" >> $FSTAB_FILE cat >> $FSTAB_FILE <<-EOF