jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiple installations in NOOBS

Browse Source 
When installing two OpenELEC based distro with NOOBS, the labels of the SYSTEM partitions conflict. This fix address that problem by prefixing the names of these partitions by the DISTRONAME.
This commit is contained in:
Jean-André Santoni 2015-01-09 23:50:07 +01:00
parent bf42102acb
commit 27fe5660a5
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/noobs/partitions.json
View File

@ -1,7 +1,7 @@
{ {
"partitions": [ "partitions": [
{ {
"label": "System", "label": "@DISTRONAME@System",
"filesystem_type": "FAT", "filesystem_type": "FAT",
"partition_size_nominal": 160, "partition_size_nominal": 160,
"want_maximised": false, "want_maximised": false,
@ -9,7 +9,7 @@
"mkfs_options": "" "mkfs_options": ""
}, },
{ {
"label": "Storage", "label": "@DISTRONAME@Storage",
"filesystem_type": "ext4", "filesystem_type": "ext4",
"partition_size_nominal": 864, "partition_size_nominal": 864,
"want_maximised": true, "want_maximised": true,

11
scripts/image
View File

@ -333,6 +333,9 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
-e "s%@DESCRIPTION@%$DESCRIPTION%g" \ -e "s%@DESCRIPTION@%$DESCRIPTION%g" \
-i $RELEASE_DIR/os.json -i $RELEASE_DIR/os.json
sed -e "s%@DISTRONAME@%$DISTRONAME%g" \
-i $RELEASE_DIR/partitions.json
# create System dir # create System dir
mkdir -p $RELEASE_DIR/System mkdir -p $RELEASE_DIR/System
@ -366,12 +369,12 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
mkdir -p $RELEASE_DIR/Storage mkdir -p $RELEASE_DIR/Storage
# remove an previous created release tarball # remove an previous created release tarball
rm -rf $RELEASE_DIR/System.tar.xz rm -rf $RELEASE_DIR/${DISTRONAME}System.tar.xz
rm -rf $RELEASE_DIR/Storage.tar.xz rm -rf $RELEASE_DIR/${DISTRONAME}Storage.tar.xz
# create filesystem tarballs # create filesystem tarballs
tar cJf $RELEASE_DIR/System.tar.xz -C $RELEASE_DIR/System/ . tar cJf $RELEASE_DIR/${DISTRONAME}System.tar.xz -C $RELEASE_DIR/System/ .
tar cJf $RELEASE_DIR/Storage.tar.xz -C $RELEASE_DIR/Storage/ . tar cJf $RELEASE_DIR/${DISTRONAME}Storage.tar.xz -C $RELEASE_DIR/Storage/ .
# remove an filesystem dirs # remove an filesystem dirs
rm -rf $RELEASE_DIR/System rm -rf $RELEASE_DIR/System