Skip to content

Commit e1c5225

Browse files
author
Neil Beadle
committed
Prep for v1.0.8
1 parent 2b724cd commit e1c5225

13 files changed

+37
-23
lines changed

.payload/postinst

+7-6
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ add_pseudo() {
125125
echo -e "\tset interfaces pseudo-ethernet peth0 description \"Pixel Server\"\n"
126126
echo -e "\tset interfaces pseudo-ethernet peth0 link <WAN Interface>\n"
127127
if [ -f /bin/systemctl ]; then
128-
echo_logger I "Note: you can add any valid peth[x] interface. However, you must edit /etc/systemd/system/pixelserv.service and change the IP address for the listener"
128+
echo_logger I "Note: you can add any valid peth[x] interface. However, you must edit /lib/systemd/system/pixelserv.service and change the IP address for the listener"
129129
else
130130
echo_logger I "Note: you can add any valid peth[x] interface. However, you must edit /etc/init.d/pixelserv and change the IP address for the listener"
131131
fi
@@ -147,7 +147,8 @@ fix_cfg_grp() {
147147
}
148148

149149
setup_init() {
150-
if [ -f /bin/systemctl ]; then
150+
if [ -f /bin/systemctl ]; then
151+
try systemctl enable pixelserv
151152
try systemctl daemon-reload
152153
else
153154
try chmod 0755 /etc/init.d/pixelserv.sysv
@@ -166,8 +167,8 @@ start_pix() {
166167

167168
case ${1} in
168169
configure)
169-
add_pseudo
170-
fix_cfg_grp
171-
setup_init
172-
start_pix
170+
add_pseudo
171+
fix_cfg_grp
172+
setup_init
173+
start_pix
173174
esac

.payload/prerem

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
# set -x
4+
35
export DEBIAN_FRONTEND=noninteractive
46

57
# Set up the Vyatta environment
@@ -125,13 +127,14 @@ fix_cfg_grp() {
125127
try chgrp -R vyattacfg /opt/vyatta/config/active
126128
}
127129

128-
remove_init(){
129-
if [ -f /bin/systemctl ]; then
130-
[ -f /etc/systemd/system/pixelserv.service ] && try systemctl disable pixelserv
131-
[ -f /etc/systemd/system/pixelserv.service ] && try systemctl daemon-reload
130+
remove_init() {
131+
if [[ -f /bin/systemctl ]]; then
132+
[[ -f /etc/systemd/system/pixelserv.service ]] && try systemctl stop pixelserv
133+
[[ -f /etc/systemd/system/pixelserv.service ]] && try systemctl disable pixelserv
134+
[[ -f /lib/systemd/system/pixelserv.service ]] && try systemctl daemon-reload
132135
else
133-
[ -f /etc/init.d/pixelserv.sysv ] && /etc/init.d/pixelserv.sysv stop
134-
[ -f /etc/init.d/pixelserv.sysv ] && try update-rc.d -f pixelserv.sysv remove
136+
[[ -f /etc/init.d/pixelserv.sysv ]] && try /etc/init.d/pixelserv.sysv stop
137+
[[ -f /etc/init.d/pixelserv.sysv ]] && try update-rc.d -f pixelserv.sysv remove
135138
fi
136139
}
137140

CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
## Releases
44

5+
### Release v1.0.8 (Apr 19, 2019)
6+
7+
* Moved /etc/systemd/system/pixelserv.service to /lib/systemd/system/pixelserv.service
8+
* Fix auto start of pixelserv following reboot by updating post install script with:
9+
10+
```bash
11+
systemctl enable pixelserv
12+
```
13+
514
### Release v1.0.7 (Apr 7, 2019)
615

716
* Updated to support EdgeOS 2.0.1

OLDVERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.7
1+
1.0.8

README.header

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ sudo apt-get update && sudo apt-get install edgeos-pixelserv
115115
### EdgeRouter ERLite-3, ERPoe-5 and similar MIPS based Edgerouters
116116

117117
```bash
118-
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.7_mips.deb
119-
sudo dpkg -i edgeos-pixelserv_1.0.7_mips.deb
118+
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.8_mips.deb
119+
sudo dpkg -i edgeos-pixelserv_1.0.8_mips.deb
120120
```
121121

122122
### EdgeRouter ER-X & ER-X-SFP
123123

124124
```bash
125-
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.7_mipsel.deb
126-
sudo dpkg -i edgeos-pixelserv_1.0.7_mipsel.deb
125+
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.8_mipsel.deb
126+
sudo dpkg -i edgeos-pixelserv_1.0.8_mipsel.deb
127127
```
128128

129129
## Removal

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ sudo apt-get update && sudo apt-get install edgeos-pixelserv
115115
### EdgeRouter ERLite-3, ERPoe-5 and similar MIPS based Edgerouters
116116

117117
```bash
118-
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.7_mips.deb
119-
sudo dpkg -i edgeos-pixelserv_1.0.7_mips.deb
118+
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.8_mips.deb
119+
sudo dpkg -i edgeos-pixelserv_1.0.8_mips.deb
120120
```
121121

122122
### EdgeRouter ER-X & ER-X-SFP
123123

124124
```bash
125-
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.7_mipsel.deb
126-
sudo dpkg -i edgeos-pixelserv_1.0.7_mipsel.deb
125+
curl -L -O https://raw.githubusercontent.com/britannic/pixelserv/master/edgeos-pixelserv_1.0.8_mipsel.deb
126+
sudo dpkg -i edgeos-pixelserv_1.0.8_mipsel.deb
127127
```
128128

129129
## Removal

VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.7
1+
1.0.8

edgeos-pixelserv_1.0.7_mips.deb

-1.86 MB
Binary file not shown.

edgeos-pixelserv_1.0.7_mipsel.deb

-1.83 MB
Binary file not shown.

edgeos-pixelserv_1.0.8_mips.deb

1.86 MB
Binary file not shown.

edgeos-pixelserv_1.0.8_mipsel.deb

1.83 MB
Binary file not shown.

make_deb

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ pwd=$(pwd)
2323
sdir="${pwd}/.payload"
2424
src1='etc/'
2525
src2='config/'
26+
src3='lib/'
2627
scripts="${sdir}/${src2}/scripts"
2728
url='https://github.com/britannic/${exe}'
2829
vend='Helm Rock Consulting'
@@ -72,7 +73,7 @@ make_debian() {
7273
-v "${ver}" \
7374
-x "${exc1}" \
7475
-x "${exc2}" \
75-
-s dir "${src1}" "${src2}"
76+
-s dir "${src1}" "${src2}" "${src3}"
7677
}
7778

7879
compress_deb(){

0 commit comments

Comments
 (0)