-
Notifications
You must be signed in to change notification settings - Fork 305
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tree-wide: Switch tabs ⭾ in various files over to spaces ␠
As $DEITY intended. I was reading the `prepare-root.c` code and the indentation damage was distracting. Squash tabs that have leaked into various places in the code. I didn't yet touch the `src/libostree` bits as that has higher potential for conflict. Closes: #852 Approved by: jlebon
- Loading branch information
1 parent
ce4d21b
commit b83d509
Showing
6 changed files
with
93 additions
and
94 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
/* -*- c-file-style: "gnu" -*- | ||
* Switch to new root directory and start init. | ||
* | ||
* | ||
* Copyright 2011,2012,2013 Colin Walters <[email protected]> | ||
* | ||
* Based on code from util-linux/sys-utils/switch_root.c, | ||
* Based on code from util-linux/sys-utils/switch_root.c, | ||
* Copyright 2002-2009 Red Hat, Inc. All rights reserved. | ||
* Authors: | ||
* Peter Jones <[email protected]> | ||
* Jeremy Katz <[email protected]> | ||
* Peter Jones <[email protected]> | ||
* Jeremy Katz <[email protected]> | ||
* | ||
* Relicensed with permission to LGPLv2+. | ||
* | ||
|
@@ -91,15 +91,15 @@ parse_ostree_cmdline (void) | |
const char *next = strchr (iter, ' '); | ||
const char *next_nonspc = next; | ||
while (next_nonspc && *next_nonspc == ' ') | ||
next_nonspc += 1; | ||
next_nonspc += 1; | ||
if (strncmp (iter, "ostree=", strlen ("ostree=")) == 0) | ||
{ | ||
const char *start = iter + strlen ("ostree="); | ||
if (next) | ||
ret = strndup (start, next - start); | ||
else | ||
ret = strdup (start); | ||
break; | ||
const char *start = iter + strlen ("ostree="); | ||
if (next) | ||
ret = strndup (start, next - start); | ||
else | ||
ret = strdup (start); | ||
break; | ||
} | ||
iter = next_nonspc; | ||
} | ||
|
@@ -115,7 +115,7 @@ static void | |
touch_run_ostree (void) | ||
{ | ||
int fd; | ||
|
||
fd = open ("/run/ostree-booted", O_CREAT | O_WRONLY | O_NOCTTY, 0640); | ||
/* We ignore failures here in case /run isn't mounted...not much we | ||
* can do about that, but we don't want to fail. | ||
|
@@ -239,11 +239,11 @@ main(int argc, char *argv[]) | |
* later boot and `systemd-remount-fs.service`. | ||
*/ | ||
if (path_is_on_readonly_fs (".")) | ||
{ | ||
if (mount (".", ".", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0) | ||
err (EXIT_FAILURE, "failed to remount rootfs writable (for overlayfs)"); | ||
} | ||
{ | ||
if (mount (".", ".", NULL, MS_REMOUNT | MS_SILENT, NULL) < 0) | ||
err (EXIT_FAILURE, "failed to remount rootfs writable (for overlayfs)"); | ||
} | ||
|
||
if (mount ("overlay", "usr", "overlay", 0, usr_ovl_options) < 0) | ||
err (EXIT_FAILURE, "failed to mount /usr overlayfs"); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters