From 3d6da2e4da467e84e8063c7ac6a80b978453d317 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 15 Jul 2018 23:41:31 +0200 Subject: [PATCH] s/system partition/rootfs: fix remaining mentions Follow-up to !1373, where `pmbootstrap flasher flash_system` was replaced with `pmbootstrap flasher flash_rootfs`. We still had used terms like "system partition" in a lot of places. This commit replaces it everywhere, so it's clear that we're talking about the pmOS rootfs (which may or may not be installed to Android's system partition). --- main/postmarketos-mkinitfs/APKBUILD | 6 +++--- main/postmarketos-mkinitfs/init_functions.sh | 4 ++-- main/postmarketos-mkinitfs/mkinitfs.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 7e2ec86d2..a55b7d4c5 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-mkinitfs pkgver=0.6.6 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" # multipath-tools: kpartx @@ -24,5 +24,5 @@ package() { mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/" } sha512sums="d5abfe9a1298069e6722555c6e16223b09b36af65d879feb64d540aa6cbc009a3aa7f00528bcf656370ec37cc64f925c72ebb77813961cd6ebf22107b57ea029 init.sh.in -dfd07a3ac1aa8a2bd999b5e06cbba12f44675989cdd54da8e5a0b27740d21d66a0543887bd15b4b2359a84fe980d65fc954e3494cfe1043b33094c30a0bb082e init_functions.sh -3ecdf70c61fa862990b3afbec872f0498e0246017502aa22106782f8c5ef361902ad05473d6c2121db359f4f1d7e7a83da322e0d9f243825c4d1144358447164 mkinitfs.sh" +40beaa5e1e8f539b5c5ab1bb213fef95dd944ce808e99a9d36439a0f94d350b9a36e6760189a6c262eb64e73b14341e0833da2e2a19f390cfab2385a2493c2bd init_functions.sh +9773dd1ca2cff54c09353388153a765d47f7affeb085f93c06c081bb597c156e6481f38d2cfbd9df450a51228126aa2d0a884542f5406d1fdf141cb07ca12216 mkinitfs.sh" diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index 909a6b45e..2c7ab3be2 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -121,8 +121,8 @@ extract_initramfs_extra() { wait_root_partition() { while [ -z "$(find_root_partition)" ]; do - show_splash /splash-nosystem.ppm.gz - echo "Could not find the root partition." + show_splash /splash-norootfs.ppm.gz + echo "Could not find the rootfs." echo "Maybe you need to insert the sdcard, if your device has" echo "any? Trying again in one second..." sleep 1 diff --git a/main/postmarketos-mkinitfs/mkinitfs.sh b/main/postmarketos-mkinitfs/mkinitfs.sh index fc85b22ef..61c8ee971 100644 --- a/main/postmarketos-mkinitfs/mkinitfs.sh +++ b/main/postmarketos-mkinitfs/mkinitfs.sh @@ -299,7 +299,7 @@ generate_splash_screens() set -- "splash-loading" "Loading..." "--center" \ "splash-noboot" "boot partition not found\\nhttps://postmarketos.org/troubleshooting" "--center" \ "splash-noinitramfsextra" "initramfs-extra not found\\nhttps://postmarketos.org/troubleshooting" "--center" \ - "splash-nosystem" "system partition not found\\nhttps://postmarketos.org/troubleshooting" "--center" \ + "splash-norootfs" "rootfs not found\\nhttps://postmarketos.org/troubleshooting" "--center" \ "splash-mounterror" "unable to mount root partition\\nhttps://postmarketos.org/troubleshooting" "--center" \ "splash-debug-shell" "WARNING\\ndebug-shell is active\\nhttps://postmarketos.org/debug-shell" "--center"