Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora

This commit is contained in:
Holger Hans Peter Freyther 2015-05-13 09:33:27 +02:00
commit ad81ff7de9
17 changed files with 247 additions and 198 deletions

View File

@ -26,12 +26,17 @@ iface eth0.2001 inet manual
# VLAN 2002: Reserved for a future Inmarsat satellite modem
# attached to port 7 of the IES-3080
auto eth0.2002
iface eth0.2002 inet dhcp
#iface eth0.2002 inet dhcp
iface eth0.2002 inet manual
# management VLAN of IES-3080 switch (172.16.2.3)
auto eth0.6
iface eth0.6 inet manual
# video VLAN on IES-3080
auto eth0.9
iface eth0.9 inet manual
#eth1 is our admin interface and will provide dhcp to clients
auto eth1
iface eth1 inet static
@ -41,14 +46,7 @@ iface eth1 inet static
# eth2 is attached to the IDU-internal SOB-JB02-SW
auto eth2
iface eth2 inet manual
pre-up ifconfig $IFACE up
pre-down ifconfig $IFACE down
# * br0 is a bridge interface on top of eth2
# * we use the bridging code so we can run mstpd and become the root bridge
auto br0
iface br0 inet static
iface eth2 inet static
bridge_ports eth2
bridge_maxwait 0
address 172.16.4.1
@ -56,18 +54,27 @@ iface br0 inet static
network 172.16.4.0
# management VLAN towards {N,P}JB
auto br0.6
iface br0.6 inet manual
auto eth2.6
iface eth2.6 inet manual
# bridge for VLAN 6: management VLAN
auto br-mgmt
iface br-mgmt inet static
bridge_ports br0.6 eth0.6
bridge_ports eth2.6 eth0.6
bridge_maxwait 0
address 172.16.2.1
netmask 255.255.254.0
network 172.16.2.0
# bridge for VLAN9: video
auto br-video
iface br-video inet static
bridge_ports eth2.9 eth0.9
bridge_maxwait 0
address 172.16.9.1
netmask 255.255.255.0
network 172.16.9.0
# 172.16.1.1 is the service IP address for SOBMGMT
auto br-mgmt:0
iface br-mgmt:0 inet static
@ -75,29 +82,46 @@ iface br-mgmt:0 inet static
netmask 255.255.255.255
# GSM management VLAN
auto br0.7
iface br0.7 inet static
auto eth2.7
iface eth2.7 inet static
address 172.16.7.1
netmask 255.255.255.0
network 172.16.7.0
# Video VLAN on JB02, part of br-video
auto eth2.9
iface eth2.9 inet manual
# admin WiFi
auto br0.1001
iface br0.1001 inet static
auto eth2.1001
iface eth2.1001 inet static
address 172.16.8.1
netmask 255.255.255.0
network 172.16.8.0
# onboad WiFi
auto br0.1002
iface br0.1002 inet static
auto eth2.1002
iface eth2.1002 inet static
address 172.16.128.1
netmask 255.255.252.0
network 172.16.128.0
# remote WiFi
auto br0.1003
iface br0.1003 inet static
auto eth2.1003
iface eth2.1003 inet static
address 172.16.132.1
netmask 255.255.252.0
network 172.16.132.0
# JB-facing device for Inmarsat Satlite Crew
auto eth2.1004
iface eth2.1004 inet manual
# uplink of Inmarsat Satlite Crew
auto eth0.1004
iface eth0.1004 inet manual
auto br-satlite
iface br-satlite inet manual
bridge_ports eth0.1004 eth2.1004
bridge_maxwait 0

View File

@ -1,6 +1,6 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:"
PRINC = "12"
PRINC = "13"
# systemd does not look at /etc/rcS.d for the script. Make sure
# there is a symlink available

View File

@ -13,7 +13,7 @@ BTS_FIRMWARE_NAME_sysmobts-v1 = "sysmobts-v1"
# Overrides for the sysmocom bts v2
BTS_FIRMWARE_NAME_sysmobts-v2 = "sysmobts-v2"
SRCREV = "9610e792ffde7fb2599d19ca6d2a03230f2043c6"
SRCREV = "0f21ba8c5b9ddf1d8c0c2bc36202e90d15ee381a"
PR = "r43"
PV = "${LINUX_VERSION}+git${SRCPV}"

View File

@ -1,19 +1,33 @@
SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESEXTRAPATHS_prepend := "${SYSMOCOM}/busybox-${SYSMOCOM_ORIG_PV}:${SYSMOCOM}/files:"
PRINC = "24"
PRINC = "26"
SRC_URI += "file://busybox-ifplugd.sh \
file://ifplugd.sh"
file://ifplugd.sh \
file://udhcpc-ntp.sh \
file://udhcpc-ntp.default \
"
PACKAGES =+ "${PN}-ifplugd"
PACKAGES =+ "${PN}-ifplugd ${PN}-udhcpc-ntp"
FILES_${PN}-ifplugd = "${sysconfdir}/ifplugd.sh ${sysconfdir}/init.d/busybox-ifplugd.sh"
FILES_${PN}-udhcpc-ntp = "${sysconfdir}/udhcpc.d/60ntp \
${sysconfdir}/default/udhcpc-ntp \
"
CONFFILES_${PN}-udhcpc-ntp = "${sysconfdir}/default/udhcpc-ntp"
INITSCRIPT_PACKAGES += "${PN}-ifplugd"
INITSCRIPT_NAME = "busybox-ifplugd.sh"
RDEPENDS_${PN}-udhcpc-ntp = "${PN}-udhcpc"
do_install_append() {
install -m 0755 ${WORKDIR}/ifplugd.sh ${D}${sysconfdir}/
install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/udhcpc-ntp.sh ${D}/${sysconfdir}/udhcpc.d/60ntp
install -d ${D}/${sysconfdir}/default
install -m 0644 ${WORKDIR}/udhcpc-ntp.default ${D}/${sysconfdir}/default/udhcpc-ntp
}

View File

@ -0,0 +1,2 @@
USE_NTPSERVER="yes"

View File

@ -0,0 +1,36 @@
#!/bin/sh
NTPDATE_CONF=/etc/default/ntpdate
NTP_CONF=/etc/ntp.conf
[ -r /etc/default/udhcpc-ntp ] && . /etc/default/udhcpc-ntp
if [ "$USE_NTPSERVER" != "yes" ]; then
exit 0
fi
case "$1" in
renew|bound)
if [ -z "$ntpsrv" ]; then
exit 0
fi
printf "ntpserver is %s\n" $ntpsrv
grep -q -s $ntpsrv ${NTPDATE_CONF}
NTPDATE_UPDATE=$?
if [ -w "${NTPDATE_CONF}" -a ${NTPDATE_UPDATE} != 0 ]; then
printf "changing ntpserver for ntpdate\n"
sed -i -e "s/\(NTPSERVERS=\)\(.*\)/\1\"$ntpsrv\"/g" ${NTPDATE_CONF}
/etc/network/if-up.d/ntpdate-sync
fi
grep -q -s $ntpsrv ${NTP_CONF}
NTP_UPDATE=$?
if [ -w "${NTP_CONF}" -a ${NTP_UPDATE} != 0 ]; then
printf "changing ntpserver for ntpd\n"
sed -i -e "1,/^server/s/^\(server\)\(.*\)/\1 $ntpsrv iburst/g" ${NTP_CONF}
systemctl restart ntpd
fi
;;
esac

View File

@ -1,151 +1,11 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
<head>
<title>meta-openembedded - Collection of OpenEmbedded layers</title>
<meta name='generator' content='cgit v0.9.2-21-gd62e'/>
<meta name='robots' content='index, nofollow'/>
<link rel='stylesheet' type='text/css' href='/cgit.css'/>
<link rel='shortcut icon' href='/favicon.ico'/>
<link rel='alternate' title='Atom feed' href='http://cgit.openembedded.org/meta-openembedded/atom/meta-networking/recipes-filter/conntrack-tools/files/init?h=master' type='application/atom+xml'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/'><img src='/oe.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a title='meta-openembedded' href='/meta-openembedded/'>meta-openembedded</a></td><td class='form'><form method='get' action=''>
<select name='h' onchange='this.form.submit();'>
<option value='daisy'>daisy</option>
<option value='daisy-next'>daisy-next</option>
<option value='danny'>danny</option>
<option value='danny-next'>danny-next</option>
<option value='denzil'>denzil</option>
<option value='denzil-next'>denzil-next</option>
<option value='dizzy'>dizzy</option>
<option value='dizzy-next'>dizzy-next</option>
<option value='dora'>dora</option>
<option value='dora-next'>dora-next</option>
<option value='dylan'>dylan</option>
<option value='dylan-next'>dylan-next</option>
<option value='fido'>fido</option>
<option value='fido-next'>fido-next</option>
<option value='jansa/dizzy'>jansa/dizzy</option>
<option value='jansa/fido'>jansa/fido</option>
<option value='jansa/master'>jansa/master</option>
<option value='master' selected='selected'>master</option>
<option value='master-next'>master-next</option>
</select> <input type='submit' name='' value='switch'/></form></td></tr>
<tr><td class='sub'>Collection of OpenEmbedded layers</td><td class='sub right'>OpenEmbedded</td></tr></table>
<table class='tabs'><tr><td>
<a href='/meta-openembedded/'>summary</a><a href='/meta-openembedded/refs/'>refs</a><a href='/meta-openembedded/log/meta-networking/recipes-filter/conntrack-tools/files/init'>log</a><a class='active' href='/meta-openembedded/tree/meta-networking/recipes-filter/conntrack-tools/files/init'>tree</a><a href='/meta-openembedded/commit/meta-networking/recipes-filter/conntrack-tools/files/init'>commit</a><a href='/meta-openembedded/diff/meta-networking/recipes-filter/conntrack-tools/files/init'>diff</a><a href='/meta-openembedded/about/'>about</a></td><td class='form'><form class='right' method='get' action='/meta-openembedded/log/meta-networking/recipes-filter/conntrack-tools/files/init'>
<select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/meta-openembedded/tree/'>root</a>/<a href='/meta-openembedded/tree/meta-networking'>meta-networking</a>/<a href='/meta-openembedded/tree/meta-networking/recipes-filter'>recipes-filter</a>/<a href='/meta-openembedded/tree/meta-networking/recipes-filter/conntrack-tools'>conntrack-tools</a>/<a href='/meta-openembedded/tree/meta-networking/recipes-filter/conntrack-tools/files'>files</a>/<a href='/meta-openembedded/tree/meta-networking/recipes-filter/conntrack-tools/files/init'>init</a></div><div class='content'>blob: bce2075a72f3545dc6a4dda34df9e26a4e15c58c (<a href='/meta-openembedded/plain/meta-networking/recipes-filter/conntrack-tools/files/init'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a>
<a class='no' id='n2' name='n2' href='#n2'>2</a>
<a class='no' id='n3' name='n3' href='#n3'>3</a>
<a class='no' id='n4' name='n4' href='#n4'>4</a>
<a class='no' id='n5' name='n5' href='#n5'>5</a>
<a class='no' id='n6' name='n6' href='#n6'>6</a>
<a class='no' id='n7' name='n7' href='#n7'>7</a>
<a class='no' id='n8' name='n8' href='#n8'>8</a>
<a class='no' id='n9' name='n9' href='#n9'>9</a>
<a class='no' id='n10' name='n10' href='#n10'>10</a>
<a class='no' id='n11' name='n11' href='#n11'>11</a>
<a class='no' id='n12' name='n12' href='#n12'>12</a>
<a class='no' id='n13' name='n13' href='#n13'>13</a>
<a class='no' id='n14' name='n14' href='#n14'>14</a>
<a class='no' id='n15' name='n15' href='#n15'>15</a>
<a class='no' id='n16' name='n16' href='#n16'>16</a>
<a class='no' id='n17' name='n17' href='#n17'>17</a>
<a class='no' id='n18' name='n18' href='#n18'>18</a>
<a class='no' id='n19' name='n19' href='#n19'>19</a>
<a class='no' id='n20' name='n20' href='#n20'>20</a>
<a class='no' id='n21' name='n21' href='#n21'>21</a>
<a class='no' id='n22' name='n22' href='#n22'>22</a>
<a class='no' id='n23' name='n23' href='#n23'>23</a>
<a class='no' id='n24' name='n24' href='#n24'>24</a>
<a class='no' id='n25' name='n25' href='#n25'>25</a>
<a class='no' id='n26' name='n26' href='#n26'>26</a>
<a class='no' id='n27' name='n27' href='#n27'>27</a>
<a class='no' id='n28' name='n28' href='#n28'>28</a>
<a class='no' id='n29' name='n29' href='#n29'>29</a>
<a class='no' id='n30' name='n30' href='#n30'>30</a>
<a class='no' id='n31' name='n31' href='#n31'>31</a>
<a class='no' id='n32' name='n32' href='#n32'>32</a>
<a class='no' id='n33' name='n33' href='#n33'>33</a>
<a class='no' id='n34' name='n34' href='#n34'>34</a>
<a class='no' id='n35' name='n35' href='#n35'>35</a>
<a class='no' id='n36' name='n36' href='#n36'>36</a>
<a class='no' id='n37' name='n37' href='#n37'>37</a>
<a class='no' id='n38' name='n38' href='#n38'>38</a>
<a class='no' id='n39' name='n39' href='#n39'>39</a>
<a class='no' id='n40' name='n40' href='#n40'>40</a>
<a class='no' id='n41' name='n41' href='#n41'>41</a>
<a class='no' id='n42' name='n42' href='#n42'>42</a>
<a class='no' id='n43' name='n43' href='#n43'>43</a>
<a class='no' id='n44' name='n44' href='#n44'>44</a>
<a class='no' id='n45' name='n45' href='#n45'>45</a>
<a class='no' id='n46' name='n46' href='#n46'>46</a>
<a class='no' id='n47' name='n47' href='#n47'>47</a>
<a class='no' id='n48' name='n48' href='#n48'>48</a>
<a class='no' id='n49' name='n49' href='#n49'>49</a>
<a class='no' id='n50' name='n50' href='#n50'>50</a>
<a class='no' id='n51' name='n51' href='#n51'>51</a>
<a class='no' id='n52' name='n52' href='#n52'>52</a>
<a class='no' id='n53' name='n53' href='#n53'>53</a>
<a class='no' id='n54' name='n54' href='#n54'>54</a>
<a class='no' id='n55' name='n55' href='#n55'>55</a>
<a class='no' id='n56' name='n56' href='#n56'>56</a>
<a class='no' id='n57' name='n57' href='#n57'>57</a>
<a class='no' id='n58' name='n58' href='#n58'>58</a>
<a class='no' id='n59' name='n59' href='#n59'>59</a>
<a class='no' id='n60' name='n60' href='#n60'>60</a>
<a class='no' id='n61' name='n61' href='#n61'>61</a>
<a class='no' id='n62' name='n62' href='#n62'>62</a>
<a class='no' id='n63' name='n63' href='#n63'>63</a>
<a class='no' id='n64' name='n64' href='#n64'>64</a>
<a class='no' id='n65' name='n65' href='#n65'>65</a>
<a class='no' id='n66' name='n66' href='#n66'>66</a>
<a class='no' id='n67' name='n67' href='#n67'>67</a>
<a class='no' id='n68' name='n68' href='#n68'>68</a>
<a class='no' id='n69' name='n69' href='#n69'>69</a>
<a class='no' id='n70' name='n70' href='#n70'>70</a>
<a class='no' id='n71' name='n71' href='#n71'>71</a>
<a class='no' id='n72' name='n72' href='#n72'>72</a>
<a class='no' id='n73' name='n73' href='#n73'>73</a>
<a class='no' id='n74' name='n74' href='#n74'>74</a>
<a class='no' id='n75' name='n75' href='#n75'>75</a>
<a class='no' id='n76' name='n76' href='#n76'>76</a>
<a class='no' id='n77' name='n77' href='#n77'>77</a>
<a class='no' id='n78' name='n78' href='#n78'>78</a>
<a class='no' id='n79' name='n79' href='#n79'>79</a>
<a class='no' id='n80' name='n80' href='#n80'>80</a>
<a class='no' id='n81' name='n81' href='#n81'>81</a>
<a class='no' id='n82' name='n82' href='#n82'>82</a>
<a class='no' id='n83' name='n83' href='#n83'>83</a>
<a class='no' id='n84' name='n84' href='#n84'>84</a>
<a class='no' id='n85' name='n85' href='#n85'>85</a>
<a class='no' id='n86' name='n86' href='#n86'>86</a>
<a class='no' id='n87' name='n87' href='#n87'>87</a>
</pre></td>
<td class='lines'><pre><code>#!/bin/sh
#!/bin/sh
#
# /etc/init.d/conntrackd
#
# Maximilian Wilhelm &lt;max&#64;rfc2324.org&gt;
# Maximilian Wilhelm <max@rfc2324.org>
# -- Mon, 06 Nov 2006 18:39:07 +0100
#
# Roman I Khimov &lt;khimov&#64;altell.ru&gt;
# Roman I Khimov <khimov@altell.ru>
# -- Tue, 27 Oct 2009 14:34:00 +0300
### BEGIN INIT INFO
@ -160,57 +20,57 @@
export PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
NAME=&quot;conntrackd&quot;
DAEMON=&quot;/usr/sbin/conntrackd&quot;
CONFIG=&quot;/etc/conntrackd/conntrackd.conf&quot;
PIDFILE=&quot;/var/run/${NAME}.pid&quot;
NAME="conntrackd"
DAEMON="/usr/sbin/conntrackd"
CONFIG="/etc/conntrackd/conntrackd.conf"
PIDFILE="/var/run/${NAME}.pid"
# Gracefully exit if there is no daemon (debian way of life)
if [ ! -x &quot;${DAEMON}&quot; ]; then
if [ ! -x "${DAEMON}" ]; then
exit 0
fi
# Check for config file
if [ ! -f /etc/conntrackd/conntrackd.conf ]; then
echo &quot;Error: There is no config file for $NAME&quot; &gt;&amp;2
echo "Error: There is no config file for $NAME" >&2
exit 1;
fi
case &quot;$1&quot; in
case "$1" in
start)
echo -n &quot;Starting $NAME: &quot;
echo -n "Starting $NAME: "
for i in nf_conntrack_netlink nf_conntrack_netbios_ns nf_conntrack_proto_dccp nf_conntrack_tftp \
nf_conntrack_sane nf_conntrack_pptp nf_conntrack_irc nf_conntrack_amanda nf_conntrack_h323 \
nf_conntrack_proto_udplite nf_conntrack_proto_gre nf_conntrack_proto_sctp nf_conntrack_ftp \
nf_conntrack_sip; do
modprobe $i &gt;/dev/null 2&gt;/dev/null &amp;
modprobe $i >/dev/null 2>/dev/null &
done
start-stop-daemon --start --quiet --make-pidfile --pidfile &quot;/var/run/${NAME}.pid&quot; --background --exec &quot;${DAEMON}&quot;
start-stop-daemon --start --quiet --make-pidfile --pidfile "/var/run/${NAME}.pid" --background --exec "${DAEMON}"
RET=$?
if [ &quot;$?&quot; = &quot;0&quot; ]; then
if [ "$?" = "0" ]; then
sleep 2
# Sync with other server
conntrackd -n
echo &quot;done.&quot;
echo "done."
else
echo &quot;FAILED!&quot;
echo "FAILED!"
fi
exit $RET
;;
stop)
echo -n &quot;Stopping $NAME:&quot;
start-stop-daemon --stop --quiet --oknodo --pidfile &quot;/var/run/${NAME}.pid&quot; &amp;&amp; echo &quot;done.&quot; || echo &quot;FAILED!&quot;
echo -n "Stopping $NAME:"
start-stop-daemon --stop --quiet --oknodo --pidfile "/var/run/${NAME}.pid" && echo "done." || echo "FAILED!"
;;
status)
echo -n &quot;conntrackd &quot;
echo -n "conntrackd "
start-stop-daemon -q -K -t -x $DAEMON
RET=$?
if [ &quot;$RET&quot; = &quot;0&quot; ]; then
if [ "$RET" = "0" ]; then
PID=`cat $PIDFILE`
echo &quot;($PID) is running&quot;
echo "($PID) is running"
else
echo &quot;is not running&quot;
echo "is not running"
exit $RET
fi
;;
@ -220,14 +80,8 @@ case &quot;$1&quot; in
;;
*)
echo &quot;Usage: /etc/init.d/conntrackd {start|stop|restart}&quot;
echo "Usage: /etc/init.d/conntrackd {start|stop|restart}"
exit 1
esac
exit 0
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class='footer'>generated by cgit v0.9.2-21-gd62e at 2015-05-01 16:43:50 (GMT)</div>
</div> <!-- id=cgit -->
</body>
</html>

View File

@ -142,11 +142,17 @@ dhcp-range=admin,172.16.6.2,172.16.6.254,255.255.255.0,24h
# DHCP range for all BTS
dhcp-range=gsm,172.16.7.10,172.16.7.254,255.255.255.0,168h
# DHCP range for IP cameras
dhcp-range=video,172.16.9.32,172.16.9.254,255.255.255.0,168h
# DHCH range for WiFi networks
dhcp-range=wifi-admin,172.16.8.10,172.16.8.254,255.255.255.0,24h
dhcp-range=wifi-onboard,172.16.128.10,172.16.131.254,255.255.252.0,24h
dhcp-range=wifi-remote,172.16.132.10,172.16.135.254,255.255.252.0,24h
# provide the ntp server running on the idu
dhcp-option=option:ntp-server,0.0.0.0
# This is an example of a DHCP range with a network-id, so that
# some DHCP options may be set only for this network.
#dhcp-range=red,192.168.0.50,192.168.0.150
@ -228,9 +234,6 @@ dhcp-range=wifi-remote,172.16.132.10,172.16.135.254,255.255.252.0,24h
# DNS server - 6
# broadcast address - 28
# Set the NTP time server addresses to 172.16.1.1
dhcp-option=42,172.16.1.1
# Set the NTP time server address to be the same machine as
# is running dnsmasq
#dhcp-option=42,0.0.0.0

View File

@ -0,0 +1,36 @@
# This configuration file lists filesystem objects that should get verified
# during startup and be created if missing.
#
# Every line must either be a comment starting with #
# or a definition of format:
# <type> <owner> <group> <mode> <path> <linksource>
# where the items are separated by whitespace !
#
# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
#
# A linking example:
# l root root 0777 /var/test /tmp/testfile
# f root root 0644 /var/test none
#
# Understanding links:
# When populate-volatile is to verify/create a directory or file, it will first
# check it's existence. If a link is found to exist in the place of the target,
# the path of the target is replaced with the target the link points to.
# Thus, if a link is in the place to be verified, the object will be created
# in the place the link points to instead.
# This explains the order of "link before object" as in the example above, where
# a link will be created at /var/test pointing to /tmp/testfile and due to this
# link the file defined as /var/test will actually be created as /tmp/testfile.
d root root 1777 /run/lock none
d root root 0755 /var/volatile/log none
d root root 1777 /var/volatile/tmp none
l root root 1777 /var/lock /run/lock
#l root root 0755 /var/log /var/volatile/log
l root root 0755 /var/run /run
l root root 1777 /var/tmp /var/volatile/tmp
l root root 1777 /tmp /var/tmp
d root root 0755 /var/lock/subsys none
f root root 0664 /var/log/wtmp none
f root root 0664 /var/run/utmp none
l root root 0644 /etc/resolv.conf /var/run/resolv.conf
f root root 0644 /var/run/resolv.conf none

View File

@ -0,0 +1,36 @@
# This configuration file lists filesystem objects that should get verified
# during startup and be created if missing.
#
# Every line must either be a comment starting with #
# or a definition of format:
# <type> <owner> <group> <mode> <path> <linksource>
# where the items are separated by whitespace !
#
# <type> : d|f|l : (d)irectory|(f)ile|(l)ink
#
# A linking example:
# l root root 0777 /var/test /tmp/testfile
# f root root 0644 /var/test none
#
# Understanding links:
# When populate-volatile is to verify/create a directory or file, it will first
# check it's existence. If a link is found to exist in the place of the target,
# the path of the target is replaced with the target the link points to.
# Thus, if a link is in the place to be verified, the object will be created
# in the place the link points to instead.
# This explains the order of "link before object" as in the example above, where
# a link will be created at /var/test pointing to /tmp/testfile and due to this
# link the file defined as /var/test will actually be created as /tmp/testfile.
d root root 1777 /run/lock none
d root root 0755 /var/volatile/log none
d root root 1777 /var/volatile/tmp none
l root root 1777 /var/lock /run/lock
#l root root 0755 /var/log /var/volatile/log
l root root 0755 /var/run /run
l root root 1777 /var/tmp /var/volatile/tmp
l root root 1777 /tmp /var/tmp
d root root 0755 /var/lock/subsys none
f root root 0664 /var/log/wtmp none
f root root 0664 /var/run/utmp none
l root root 0644 /etc/resolv.conf /var/run/resolv.conf
f root root 0644 /var/run/resolv.conf none

View File

@ -0,0 +1,4 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-dora"], d)}:"
PRINC="4"

View File

@ -0,0 +1,4 @@
THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${THISDIR}/files-master"], d)}:"
PRINC="4"

View File

@ -0,0 +1,34 @@
# This file is part of systemd.
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
#
# See journald.conf(5) for details
# Always use a volatile storage and keep the log size down but more
# importantly the address space of the journald
[Journal]
Storage=persistent
#Compress=yes
#Seal=no
#RateLimitInterval=10s
#RateLimitBurst=200
#SystemMaxUse=10
#SystemKeepFree=
#SystemMaxFileSize=
#SystemMinFileSize=
RuntimeMaxUse=648K
#RuntimeKeepFree=
#RuntimeMaxFileSize=
#RuntimeMinFileSize=
#ForwardToSyslog=yes
#ForwardToKMsg=no
#ForwardToConsole=no
#TTYPath=/dev/console
#MaxLevelStore=debug
#MaxLevelSyslog=debug
#MaxLevelKMsg=notice
#MaxLevelConsole=info

View File

@ -1,7 +1,7 @@
S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
PRINC="24"
PRINC="25"
SRC_URI += "file://journald.conf \
file://legacy.conf \

View File

@ -0,0 +1 @@
require recipes-fixes/initscripts/${PN}_dora.inc

View File

@ -0,0 +1 @@
require recipes-fixes/initscripts/${PN}_master.inc