Changeset 5830c7b in mainline

Timestamp:

2020-01-09T01:04:57Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

b09e0d7

Parents:

5d35021

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-12-20 19:23:13)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2020-01-09 01:04:57)

Message:

Removing rootfs from sysman units

For debugging reasons it's easier to work without an extra mounted root hd.
This commit might need to be rollbacked in the future. But since no rootfs
specific code has been imported from the original repo, it can to been removed

Location:

uspace

Files:

• cfg/sysman/barber.svc (modified) (1 diff)
• cfg/sysman/comp:0__winreg.svc (modified) (1 diff)
• cfg/sysman/hid__input.svc (modified) (2 diffs)
• cfg/sysman/irc.svc (modified) (1 diff)
• cfg/sysman/locfs.svc (modified) (1 diff)
• cfg/sysman/net__dhcp.svc (modified) (1 diff)
• cfg/sysman/net__dnsr.svc (modified) (1 diff)
• cfg/sysman/net__ethip.svc (modified) (1 diff)
• cfg/sysman/net__inet.svc (modified) (1 diff)
• cfg/sysman/net__loopback.svc (modified) (1 diff)
• cfg/sysman/net__netconf.svc (modified) (1 diff)
• cfg/sysman/net__tcp.svc (modified) (1 diff)
• cfg/sysman/net__udp.svc (modified) (1 diff)
• cfg/sysman/rootfs.cfg (deleted)
• cfg/sysman/rootfs.mnt (deleted)
• cfg/sysman/rootfs.tgt (deleted)
• cfg/sysman/vlaunch.svc (modified) (2 diffs)
• srv/sysman/main.c (modified) (1 diff)

uspace/cfg/sysman/barber.svc

@@ -1 +1 @@
 [Unit]
-After = rootfs.mnt
 
 ; unclear status of barber as service (more relevant to user session)
 [Service]
-ExecStart = /root/app/barber comp:0/winreg
-
+ExecStart = /app/barber comp:0/winreg

uspace/cfg/sysman/comp:0__winreg.svc

@@ -1 +1 @@
 [Unit]
-; mountpoint dependency must be explicit
-After = rootfs.mnt
 
 [Service]
-ExecStart = /root/srv/compositor hid/input :0
-
+ExecStart = /srv/compositor hid/input :0

uspace/cfg/sysman/hid__input.svc

@@ -1 +1 @@
 [Unit]
-; mountpoint dependency must be explicit
-After = rootfs.mnt
-
 ; explicit
 ; as it's somehow needed for keyboard/mouse drivers (via ISA/PCI driver calls?)
@@ -8 +5 @@
 
 [Service]
-ExecStart = /root/srv/input hid/input
-
+ExecStart = /srv/input hid/input

uspace/cfg/sysman/irc.svc

@@ -1 +1 @@
 ; ia32 only
 [Service]
-ExecStart = /root/srv/i8259
-
+ExecStart = /srv/i8259

uspace/cfg/sysman/locfs.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/locfs
-
+ExecStart = /srv/locfs

uspace/cfg/sysman/net__dhcp.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/dhcp
+ExecStart = /srv/dhcp

uspace/cfg/sysman/net__dnsr.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/dnsrsrv
+ExecStart = /srv/dnsrsrv

uspace/cfg/sysman/net__ethip.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/ethip
-
+ExecStart = /srv/ethip

uspace/cfg/sysman/net__inet.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/inetsrv
-
+ExecStart = /srv/inetsrv

uspace/cfg/sysman/net__loopback.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/loopip
-
+ExecStart = /srv/loopip

uspace/cfg/sysman/net__netconf.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/nconfsrv
+ExecStart = /srv/nconfsrv

uspace/cfg/sysman/net__tcp.svc

@@ -4 +4 @@
 
 [Service]
-ExecStart = /root/srv/tcp
-
+ExecStart = /srv/tcp

uspace/cfg/sysman/net__udp.svc

@@ -1 +1 @@
 [Service]
-ExecStart = /root/srv/udp
-
+ExecStart = /srv/udp

uspace/cfg/sysman/vlaunch.svc

@@ -1 +1 @@
 [Unit]
-; explicit because of executable path
-After = rootfs.mnt
 ; explicit as vterm->getterm needs it
 After = locfs.mnt
@@ -7 +5 @@
 ; unclear status of vlaunch as a service (more relevant to user session)
 [Service]
-ExecStart = /root/app/vlaunch comp:0/winreg
-
+ExecStart = /app/vlaunch comp:0/winreg

uspace/srv/sysman/main.c

@@ -52 +52 @@
 static const char *target_sequence[] = {
         TARGET_INIT,
-        TARGET_ROOTFS,
+        //TODO: Mount root fs
+        //TARGET_ROOTFS,
         TARGET_DEFAULT,
         NULL