raspberrypi/rpi-update
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-update.git synced 2026-01-20 21:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14 from adammw/boot-path-patch

Browse Source 
Test if BOOT_PATH and ROOT_PATH are unset rather than their default values
This commit is contained in:
Liam McLoughlin
2012-12-25 15:32:07 -08:00
parent 77b9ee415f faad48b338
commit 3eb5786dd5
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rpi-update
View File

@@ -8,6 +8,12 @@ REPO_URI="http://github.com/Hexxeh/rpi-firmware"
UPDATE2=${UPDATE2:-1} UPDATE2=${UPDATE2:-1}
UPDATE_URI="https://github.com/Hexxeh/rpi-update/raw/master/rpi-update" UPDATE_URI="https://github.com/Hexxeh/rpi-update/raw/master/rpi-update"
if [[ ${BOOT_PATH:-"unset"} == "unset" && ${ROOT_PATH:-"unset"} != "unset" ]] ||
[[ ${BOOT_PATH:-"unset"} != "unset" && ${ROOT_PATH:-"unset"} == "unset" ]]; then
echo "You need to specify both ROOT_PATH and BOOT_PATH, or neither"
exit 1
fi
ROOT_PATH=${ROOT_PATH:-"/"} ROOT_PATH=${ROOT_PATH:-"/"}
BOOT_PATH=${BOOT_PATH:-"/boot"} BOOT_PATH=${BOOT_PATH:-"/boot"}
SKIP_KERNEL=${SKIP_KERNEL:-0} SKIP_KERNEL=${SKIP_KERNEL:-0}
@@ -164,12 +170,6 @@ if [[ ${UPDATE2} -ne 0 ]]; then
update_self update_self
fi fi
if [[ ( "${ROOT_PATH}" == "/" && "${BOOT_PATH}" != "/boot" ) ]] ||
[[ ( "${BOOT_PATH}" == "/boot" && "${ROOT_PATH}" != "/" ) ]]; then
echo "You need to specify both ROOT_PATH and BOOT_PATH, or neither"
exit 1
fi
if [[ ! -d "${FW_PATH}" ]]; then if [[ ! -d "${FW_PATH}" ]]; then
echo "${FW_PATH} doesn't exist" echo "${FW_PATH} doesn't exist"
exit 1 exit 1