quagga: unify volatiles file name
PATCH 1/1 quagga: unify volatiles file name
Make the volatiles file name starts with digital.
--- meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-networking/recipes-protocols/quagga/quagga.inc +2 -2
@@ -81,7 +81,7 @@ do_install () { install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga # Install sample configurations for the daemons for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do
@@ -106,7 +106,7 @@ do_install () { sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h
Signature · 1 line
2.17.1
Quoted 2 lines · Yi Zhao
Make the volatiles file name starts with digital.
what does this get us ?
Quoted 34 lines
Signed-off-by Yi Zhao <[email protected]>--- meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-networking/recipes-protocols/quagga/quagga.inc +2
-3@@ -81,7 +81,7 @@ do_install () { install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga # Install sample configurations for the daemons for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do@@ -106,7 +106,7 @@ do_install () { sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h --2.17.1
Quoted 3 lines · Khem Raj
Quoted 1 line · Yi Zhao
Make the volatiles file name starts with digital.
what does this get us ?
Just want to make all volatiles file names uniform. I searched oe-core and meta-openembedded, only pulseaudio and quagga volatiles file names are not start with number value.
$ ls /etc/default/volatiles 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant volatiles.03_quagga volatiles.04_pulse
//Yi
Quoted 34 lines
Quoted 34 lines
Signed-off-by Yi Zhao <[email protected]>--- meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-networking/recipes-protocols/quagga/quagga.inc +2
-3@@ -81,7 +81,7 @@ do_install () { install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga # Install sample configurations for the daemons for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do@@ -106,7 +106,7 @@ do_install () { sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h --2.17.1
Quoted 8 lines · Yi Zhao
Quoted 3 lines · Khem Raj
Quoted 1 line · Yi Zhao
Make the volatiles file name starts with digital.
what does this get us ?
Quoted 6 lines
Just want to make all volatiles file names uniform. I searched oe-core and meta-openembedded, only pulseaudio and quagga volatiles file names are not start with number value.
$ ls /etc/default/volatiles 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant volatiles.03_quagga volatiles.04_pulse
this will change the order of their execution, is the new order still working without other side effects
Quoted 38 lines
//Yi
Quoted 34 lines
Quoted 34 lines
Signed-off-by Yi Zhao <[email protected]>--- meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-networking/recipes-protocols/quagga/quagga.inc +2
-3@@ -81,7 +81,7 @@ do_install () { install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga # Install sample configurations for the daemons for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do@@ -106,7 +106,7 @@ do_install () { sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h --2.17.1
Quoted 7 lines · Khem Raj
Quoted 6 lines · Yi Zhao
Quoted 3 lines · Khem Raj
Quoted 1 line · Yi Zhao
Make the volatiles file name starts with digital.
what does this get us ?
Quoted 8 lines
Quoted 6 lines
Just want to make all volatiles file names uniform. I searched oe-core and meta-openembedded, only pulseaudio and quagga volatiles file names are not start with number value.
$ ls /etc/default/volatiles 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant volatiles.03_quagga volatiles.04_pulsethis will change the order of their execution, is the new order still working without other side effects
I have tested the changes and didn't find any side effects:
1. The volatile file only creates directories under /var/run or /var/log for its own package. It doesn't impact other packages.
2. The populate-volatile.sh service runs on RCS.d
3. The 00_create volatile file always run first to make sure the base directories /var/log, /var/run are created.
//Yi
Quoted 36 lines
Quoted 36 lines
//Yi
Quoted 33 lines
Quoted 33 lines
Signed-off-by Yi Zhao <[email protected]>--- meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)meta-networking/recipes-protocols/quagga/quagga.inc +2
-3@@ -81,7 +81,7 @@ do_install () { install -m 0644 ${WORKDIR}/watchquagga.default ${D}${sysconfdir}/default/watchquagga install -m 0755 ${WORKDIR}/quagga.init ${D}${sysconfdir}/init.d/quagga install -m 0755 ${WORKDIR}/watchquagga.init ${D}${sysconfdir}/init.d/watchquagga - install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + install -m 0644 ${WORKDIR}/volatiles.03_quagga ${D}${sysconfdir}/default/volatiles/03_quagga # Install sample configurations for the daemons for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do@@ -106,7 +106,7 @@ do_install () { sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/bin/!${bindir}/!g' ${D}${sysconfdir}/init.d/quagga sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/watchquagga - sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/volatiles.03_quagga + sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/* ${D}${sysconfdir}/default/volatiles/03_quagga sed -i 's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/* sed -i 's!--with-libtool-sysroot=[^ "]*!!' ${D}${includedir}/quagga/version.h --2.17.1
Ok, thanks.
Quoted 80 lines · Yi Zhao
Quoted 7 lines · Khem Raj
Quoted 6 lines · Yi Zhao
Quoted 3 lines · Khem Raj
Quoted 1 line · Yi Zhao
Make the volatiles file name starts with digital.
what does this get us ?
Quoted 8 lines
Quoted 6 lines
Just want to make all volatiles file names uniform. I searched oe-core and meta-openembedded, only pulseaudio and quagga volatiles file names are not start with number value.
$ ls /etc/default/volatiles 00_core 01_bootlogd 99_dbus 99_sshd 99_wpa_supplicant volatiles.03_quagga volatiles.04_pulsethis will change the order of their execution, is the new order still working without other side effects
I have tested the changes and didn't find any side effects:
1. The volatile file only creates directories under/var/runor/var/logfor its own package. It doesn't impact other packages.
2. Thepopulate-volatile.shservice runs on RCS.d
3. The 00_create volatile file always run first to make sure the base directories/var/log,/var/runare created.//Yi
Quoted 9 lines
Quoted 9 lines
//Yi
Quoted 6 lines
Review
Quoted 6 lines
Signed-off-by Yi Zhao <[email protected]>--- meta-networking/recipes-protocols/quagga/quagga.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)(quoted diff) +0
-0b/meta-networking/recipes-protocols/quagga/quagga.inc
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 81
Quoted 5 lines
index
11b7d576a..6df72427b100644meta-networking/recipes-protocols/quagga/quagga.inc +0
-0@@ -81,7 +81,7 @@ do_install () { install -m 0644 ${WORKDIR}/watchquagga.default${D}${sysconfdir}/default/watchquagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 82
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-0install -m 0755 ${WORKDIR}/quagga.init${D}${sysconfdir}/init.d/quagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 83
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-0install -m 0755 ${WORKDIR}/watchquagga.init${D}${sysconfdir}/init.d/watchquagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 84
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-1- install -m 0644 ${WORKDIR}/volatiles.03_quagga${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 84
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +1
-0+ install -m 0644 ${WORKDIR}/volatiles.03_quagga${D}${sysconfdir}/default/volatiles/03_quagga
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 107
Quoted 6 lines
meta-networking/recipes-protocols/quagga/quagga.inc +0
-0# Install sample configurations for the daemons for f in bgpd vtysh isisd ospfd ripngd zebra ripd ospf6d; do@@ -106,7 +106,7 @@ do_install () { sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/* sed -i 's!/usr/bin/!${bindir}/!g'${D}${sysconfdir}/init.d/quagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 108
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-0sed -i 's!/etc/!${sysconfdir}/!g' ${D}${sysconfdir}/init.d/*${D}${sysconfdir}/default/watchquagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 109
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-1- sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/*${D}${sysconfdir}/default/volatiles/volatiles.03_quagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 109
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +1
-0+ sed -i 's!/var/!${localstatedir}/!g' ${D}${sysconfdir}/init.d/*${D}${sysconfdir}/default/volatiles/03_quagga
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 110
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-0sed -i's!^PATH=.*!PATH=${base_sbindir}:${sbindir}:${base_bindir}:${bindir}!' ${D}${sysconfdir}/init.d/*
Quoted 1 line
Quoted 1 line
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc do_install () { · line 111
Quoted 1 line
meta-networking/recipes-protocols/quagga/quagga.inc +0
-0sed -i 's!--with-libtool-sysroot=[^ "]*!!'
${D}${includedir}/quagga/version.hQuoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta-networking/recipes-protocols/quagga/quagga.inc +0
-1--2.17.1