[libvirt] [libvirt-sandbox] virt-sandbox-service: fixed /lib/ into /usr/lib for searching unit files
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit if os.path.exists(src): return src return None -- 1.8.4.5
Hi all, Is that patch now burried too far away in the mail stack? Could someone review it? -- Cedric On Tue, 2014-05-13 at 10:10 +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit if os.path.exists(src): return src return None
On Tue, May 13, 2014 at 10:10:36AM +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit
This makes sense to me as systemd installs unit files in $rootdir/lib/systemd, with $rootdir set to /usr at least upstream and in fedora. Are you having issues withusing /lib instead of /usr/lib? Or is it just cleaner this way? Christophe
On Wed, 2014-06-04 at 11:24 +0200, Christophe Fergeau wrote:
On Tue, May 13, 2014 at 10:10:36AM +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit
This makes sense to me as systemd installs unit files in $rootdir/lib/systemd, with $rootdir set to /usr at least upstream and in fedora. Are you having issues withusing /lib instead of /usr/lib? Or is it just cleaner this way?
Yes, we don't have a /lib symlink pointing to /usr/lib: so failing here on openSUSE. -- Cedric
On Wed, Jun 04, 2014 at 01:24:17PM +0200, Cedric Bosdonnat wrote:
On Wed, 2014-06-04 at 11:24 +0200, Christophe Fergeau wrote:
On Tue, May 13, 2014 at 10:10:36AM +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit
This makes sense to me as systemd installs unit files in $rootdir/lib/systemd, with $rootdir set to /usr at least upstream and in fedora. Are you having issues withusing /lib instead of /usr/lib? Or is it just cleaner this way?
Yes, we don't have a /lib symlink pointing to /usr/lib: so failing here on openSUSE.
Ah, this would be useful info to have in the commit log imo. ACK from me, though I'm not familiar at all with all of this ;) Christophe
On Wed, Jun 04, 2014 at 01:24:17PM +0200, Cedric Bosdonnat wrote:
On Wed, 2014-06-04 at 11:24 +0200, Christophe Fergeau wrote:
On Tue, May 13, 2014 at 10:10:36AM +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit
This makes sense to me as systemd installs unit files in $rootdir/lib/systemd, with $rootdir set to /usr at least upstream and in fedora. Are you having issues withusing /lib instead of /usr/lib? Or is it just cleaner this way?
Yes, we don't have a /lib symlink pointing to /usr/lib: so failing here on openSUSE.
Oh I thought systemd required that / and /usr were always one and the same location ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
On Wed, 2014-06-04 at 12:51 +0100, Daniel P. Berrange wrote:
On Wed, Jun 04, 2014 at 01:24:17PM +0200, Cedric Bosdonnat wrote:
On Wed, 2014-06-04 at 11:24 +0200, Christophe Fergeau wrote:
On Tue, May 13, 2014 at 10:10:36AM +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit
This makes sense to me as systemd installs unit files in $rootdir/lib/systemd, with $rootdir set to /usr at least upstream and in fedora. Are you having issues withusing /lib instead of /usr/lib? Or is it just cleaner this way?
Yes, we don't have a /lib symlink pointing to /usr/lib: so failing here on openSUSE.
Oh I thought systemd required that / and /usr were always one and the same location ?
Well, I'm pointed to this page for the details of the story: http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken/ -- Cedric
On Wed, Jun 04, 2014 at 02:22:05PM +0200, Cedric Bosdonnat wrote:
On Wed, 2014-06-04 at 12:51 +0100, Daniel P. Berrange wrote:
On Wed, Jun 04, 2014 at 01:24:17PM +0200, Cedric Bosdonnat wrote:
On Wed, 2014-06-04 at 11:24 +0200, Christophe Fergeau wrote:
On Tue, May 13, 2014 at 10:10:36AM +0200, Cédric Bosdonnat wrote:
--- bin/virt-sandbox-service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/virt-sandbox-service b/bin/virt-sandbox-service index 2dcbfb8..9ed37e0 100755 --- a/bin/virt-sandbox-service +++ b/bin/virt-sandbox-service @@ -1071,7 +1071,7 @@ class CheckUnit(argparse.Action): src = "/etc/systemd/system/" + unit if os.path.exists(src): return src - src = "/lib/systemd/system/" + unit + src = "/usr/lib/systemd/system/" + unit
This makes sense to me as systemd installs unit files in $rootdir/lib/systemd, with $rootdir set to /usr at least upstream and in fedora. Are you having issues withusing /lib instead of /usr/lib? Or is it just cleaner this way?
Yes, we don't have a /lib symlink pointing to /usr/lib: so failing here on openSUSE.
Oh I thought systemd required that / and /usr were always one and the same location ?
Well, I'm pointed to this page for the details of the story: http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken/
"On the Fedora distribution we have succeeded to clean up the situation and the confusion the current split between / and /usr has created. We have moved all tools that over time have been moved to / back to /usr (where they belong), and the root file system only contains compatibility symlinks for /bin and /sbin into /usr. All binaries of the system are exclusively located within the /usr hierarchy. " So from that it makes sense that we use /usr/lib as the canonical path location. So ACK to your patch Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
participants (4)
-
Cedric Bosdonnat -
Christophe Fergeau -
Cédric Bosdonnat
-
Daniel P. Berrange