Fix merge issue.

This commit is contained in:
Jesse Smith 2018-03-27 20:33:16 -03:00
parent c0f5983562
commit 21a982f36a

View File

@ -66,11 +66,7 @@ You might want to create a file called "/etc/shutdown.allow". Read the
manual page on shutdown to find out more about this. manual page on shutdown to find out more about this.
Running from a read-only file system (CDROM?): Running from a read-only file system (CDROM?):
<<<<<<< HEAD
* All communication to init goes through the FIFO /run/initctl. * All communication to init goes through the FIFO /run/initctl.
=======
o All communication to init goes through the FIFO /run/initctl.
>>>>>>> beta
There should be no problem using a read-only root file system There should be no problem using a read-only root file system
IF you use a Linux kernel > 1.3.66. Older kernels don't allow IF you use a Linux kernel > 1.3.66. Older kernels don't allow
writing to a FIFO on a read-only file system. writing to a FIFO on a read-only file system.