Skip to content
Snippets Groups Projects
Commit daea5e86 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

remove bad policy decision and behaviour

parent 3fc2c6c3
No related branches found
No related tags found
No related merge requests found
......@@ -43,7 +43,8 @@
</li>
<li>
<tt><b>-m</b></tt> : umount the basename of the <em>LIVE</em> directory set in the <tt>init.conf</tt> skeleton file and mount a tmpfs on it. This is the default.
<tt><b>-m</b></tt> : umount the basename of the <em>LIVE</em> directory set into the <tt>init.conf</tt> skeleton file if it already mounted and mount a tmpfs on it.
By default, the <em>LIVE</em> basename is mounted if it not already a valid mountpoint. Otherwise without the <tt>-m</tt> option, it does nothing.
</li>
<li>
......@@ -88,7 +89,6 @@
<li>
It becomes a session leader.
</li>
<li>
It mounts a devtmpfs on <em>dev</em>, if requested.
</li>
......@@ -98,7 +98,7 @@
</li>
<li>
It checks if the <em>LIVE</em> basename is a valid mountpoint and if so unmounts it. If requested it then mounts a tmpfs on top. If the <em>LIVE</em> basename is not a valid mountpoint it directly mounts tmpfs.
It checks if the <em>LIVE</em> basename is a valid mountpoint and if so mounts it. If requested, it unmounts if the <em>LIVE</em> basename is a valid mountpoint and performs a mount.
</li>
<li>
......@@ -247,7 +247,7 @@
<br><hr>
<p>
The following skeleton files are called to execute their corresponding power related functions and are safe wrappers that accept their corresponding command options. They <strong>should be copied or symlinked</strong> to the binary directory of the system.
The following skeleton files are called to execute their corresponding power related functions and are safe wrappers that accept their corresponding command options. They <b>should be copied or symlinked</b> to the binary directory of the system.
</p>
<li>
......
......@@ -25,6 +25,11 @@
*-m*
Umount the basename of the _LIVE_ directory set into the _init.conf_
skeleton file and mount a tmpfs on it. This is the default.
Umount the basename of the _LIVE_ directory set into the _init.conf_
skeleton file if it already mounted and mount a tmpfs on it. By default,
the _LIVE_ basename is mounted if it not already a valid mountpoint.
Otherwise without the *-m* option, it does nothing.
*-l* _log_user_
The catch-all logger will run as the _log_user_ user. Default is *root*.
......@@ -58,9 +63,9 @@ When booting a system, *66-boot* performs the following operations:
- It mounts a devtmpfs on */dev*, if requested.
- It uses */dev/null* as its stdin (instead of */dev/console*).
- *dev/console* is still used, for now, as stdout and stderr.
- It check the _LIVE_ basename as valid mountpoint and unmount it in such
case then mount a tmpfs on it if requested. If _LIVE_ basename is not
valid mountpoint it mount directly a tmpfs on it.
- It checks if the _LIVE_ basename is a valid mountpoint and if so mounts it.
If requested, it unmounts if the _LIVE_ basename is a valid mountpoint
and performs a mount.
- It create _LIVE_ directory invocating
"66-scandir -v _VERBOSITY_ -l _LIVE_ -b -c -s _skel_" more "-L user_log" if
requested.
......
#!@EXECLINE_SHEBANGPREFIX@/execlineb -P
66-boot -m
66-boot
......@@ -299,17 +299,17 @@ int main(int argc, char const *const *argv,char const *const *envp)
if (!opened)
if (open("/dev/null", O_RDONLY)) sulogin("open: ", "/dev/null") ;
if (tmpfs)
char fs[livelen + 1] ;
split_tmpfs(fs,live) ;
r = is_mnt(fs) ;
if (!r || tmpfs)
{
char fs[livelen + 1] ;
split_tmpfs(fs,live) ;
r = is_mnt(fs) ;
if (r)
if (r && tmpfs)
{
strerr_warni2x("Umount: ",fs) ;
if (umount(fs) == -1) sulogin ("umount: ",fs ) ;
}
strerr_warni2x("Mount: ",fs) ;
if (mount("tmpfs", fs, "tmpfs", MS_NODEV | MS_NOSUID, "mode=0755") == -1)
sulogin("mount: ",fs) ;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment