linse/boxtools
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove boxid from cfg file name

Browse Source
This commit is contained in:
zolliker
2025-04-08 14:50:50 +02:00
parent f28b1bcabd
commit 0b3dacfb32
27 changed files with 189 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cfg/dilsc_5a58e4.cfg → cfg/dilsc.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:5a:58:e4
[NETWORK]
; please refer to README.md for help
eth0=192.168.1.1/24

4
cfg/flamedil_512b81.cfg → cfg/flamedil.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=dual-eth-rpi
MAC=d8:3a:dd:51:2b:81
[NETWORK]
eth0=wan
eth1=192.168.99.5

4
cfg/flamemag_512ae6.cfg → cfg/flamemag.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=dual-eth-rpi
MAC=d8:3a:dd:51:2a:e6
[NETWORK]
eth0=wan
eth1=192.168.99.7

4
cfg/ir-dil_60f0e8.cfg → cfg/ir-dil.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:60:f0:e8
[NETWORK]
; please refer to README.md for help
eth0=192.168.127.254

4
cfg/linse-apu4_5a4c90.cfg → cfg/linse-apu4.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:5a:4c:90
[NETWORK]
; please refer to README.md for help
eth0=wan

4
cfg/linse-apu5_5fba48.cfg → cfg/linse-apu5.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:5f:ba:48
[NETWORK]
; please refer to README.md for help
eth0=wan

4
cfg/linse-apu6_5fa5cc.cfg → cfg/linse-apu6.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:5f:a5:cc
[NETWORK]
; please refer to README.md for help
eth0=wan,192.168.1.0/24

4
cfg/linse-apu7_5fb688.cfg → cfg/linse-apu7.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:5f:b6:88
[NETWORK]
; please refer to README.md for help
eth0=wan,192.168.1.0/24

4
cfg/linse-box2_5b2a64.cfg → cfg/linse-box2.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=control-box
MAC=00:0d:b9:5b:2a:64
[NETWORK]
; please refer to README.md for help
eth0=dhcp

4
cfg/linse-dil5_591fac.cfg → cfg/linse-dil5.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:59:1f:ac
[NETWORK]
; please refer to README.md for help
eth0=dhcp

4
cfg/linse-gas10ka_5b265c.cfg → cfg/linse-gas10ka.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=control-box
MAC=00:0d:b9:5b:26:5c
[NETWORK]
; please refer to README.md for help
eth0=dhcp

4
cfg/linse-rpi10_ca0e2b.cfg → cfg/linse-rpi10.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=ionopi
MAC=e4:5f:01:ca:0e:2b
; please refer to README.md for help
[BOX]

4
cfg/linse-rpi2.cfg Normal file
View File

@ -0,0 +1,4 @@
[BOX]
type=ionopimax
MAC=b8:27:eb:41:3f:b2

0
cfg/linse-rpi2_413fb2.cfg
View File

4
cfg/linse-rpi4.cfg Normal file
View File

@ -0,0 +1,4 @@
[BOX]
type=ionopimax
MAC=b8:27:eb:8a:09:27

0
cfg/linse-rpi4_8a0927.cfg
View File

4
cfg/linse-rpi5.cfg Normal file
View File

@ -0,0 +1,4 @@
[BOX]
type=ionopimax
MAC=b8:27:eb:ce:a5:ec

0
cfg/linse-rpi5_cea5ec.cfg
View File

4
cfg/linse-rpi7_512c7d.cfg → cfg/linse-rpi7.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=dual-eth-rpi
MAC=d8:3a:dd:51:2c:7d
[NETWORK]
eth0=wan
eth1=192.168.127.2

4
cfg/linse-rpi9.cfg Normal file
View File

@ -0,0 +1,4 @@
[BOX]
type=ionopimax
MAC=b8:27:eb:ca:0e:a3

0
cfg/linse-rpi9_ca0ea3.cfg
View File

4
cfg/linse-uniax_5920a8.cfg → cfg/linse-uniax.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=bare-apu
MAC=00:0d:b9:59:20:a8
[NETWORK]
; please refer to README.md for help
eth0=192.168.127.2/24

4
cfg/razorbill_5b251c.cfg → cfg/razorbill.cfg
View File

@ -1,3 +1,7 @@
[BOX]
type=control-box
MAC=00:0d:b9:5b:25:1c
[NETWORK]
; please refer to README.md for help
eth0=dhcp

7
gitea.py
View File

@ -81,14 +81,15 @@ def change_to_gitea(doit, *repos):
if write_when_new(doit, '.git/hooks/pre-commit', PRE_COMMIT_HOOK):
dirty = True
helper_script = parser.get('credential', 'helper', fallback=None)
if helper_script != str('.git/hooks/get_gitea_token'):
new_helper = f'{os.getcwd()}/.git/hooks/get_gitea_token'
if helper_script != new_helper:
dirty = True
if doit:
os.system(f'git config credential.helper "{os.getcwd()}/.git/hooks/get_gitea_token"')
os.system(f'git config credential.helper "{new_helper}"')
elif helper_script:
print('need to change gitea credential helper')
else:
print('missing gitea credential helper', e)
print('missing gitea credential helper')
url = parser.get('remote "origin"', 'url', fallback=None)
if url != GITEA_URL % repo:
dirty = True

48
install.py
View File

@ -35,7 +35,7 @@ except ImportError:
serial = None
try:
from utils import BoxInfo, check_service, unix_cmd, change_firewall, UndefinedConfigFile
from utils import BoxInfo, check_service, unix_cmd, change_firewall, UndefinedConfigFile, convert_cfg
except ImportError:
if 'yes'.startswith(input('install netifaces? [y]')):
os.system('sudo pip3 install --break-system-packages netifaces')
@ -47,7 +47,7 @@ if serial is None:
TOOLS = BoxInfo.TOOLS
BOX_TYPES = {'ionopi', 'ionopimax', 'controlbox', 'bare-apu', 'dual-eth-rpi'}
BOX_TYPES = {'ionopi', 'ionopimax', 'control-box', 'bare-apu', 'dual-eth-rpi'}
more_info = False
@ -60,7 +60,8 @@ TEMPLATES = {}
TEMPLATES['bare-apu'] = f"""{COMMENT}
[BOX]
type=bare-apu
type=%s
MAC=%s
[NETWORK]
eth0=wan
@ -72,10 +73,11 @@ eth3=192.168.127.254
3001=192.168.127.254:3001
"""
TEMPLATES['controlbox'] = f"""{COMMENT}
TEMPLATES['control-box'] = f"""{COMMENT}
[BOX]
type=controlbox
type=%s
MAC=%s
[NETWORK]
eth0=wan
@ -92,7 +94,8 @@ line2=ADDR
TEMPLATES['dual-eth-rpi'] = f"""{COMMENT}
[BOX]
type=dual-eth-rpi
type=%s
MAC=%s
[NETWORK]
eth0=wan
@ -103,6 +106,7 @@ GENERIC_TEMPLATE = f"""{COMMENT}
[BOX]
type=%s
MAC=%s
[NETWORK]
eth0=wan
@ -211,7 +215,7 @@ def router(firewall=False, **opts):
def display_update(cfg):
text = '\n'.join(cfg.get('startup_text', '').split('|')[:3])
text = text.replace('HOST', box.hostname) \
.replace('ADDR', box.get_macaddr()) + '\n'
.replace('ADDR', box.macaddr) + '\n'
if write_when_new(STARTUP_TEXT, text):
print('change startup text')
if doit:
@ -482,7 +486,12 @@ def handle_config():
try:
config = box.read_config()
except UndefinedConfigFile as e:
print(e)
print(f'{box.cfgfile} not found', e)
if box.oldcfg:
print(f'convert {box.cfgfile} to {convert_cfg(box.cfgfile, box.macaddr)}')
config = box.read_config()
cfgfile = box.cfgfile
newhostname = box.hostname
if cfgfile:
@ -507,7 +516,7 @@ def handle_config():
disp.write(b'\x1b\x1b\x01\xf3')
display_available = disp.read(8)[0:4] == b'\x1b\x1b\x05\xf3'
if display_available:
box.typ = 'controlbox'
box.typ = 'control=box'
else:
box.typ = 'bare-apu'
elif box.typ == 'cm4':
@ -519,23 +528,25 @@ def handle_config():
template = TEMPLATES.get(box.typ)
if template is None:
box.typ = box.typ or 'unknown-box'
template = GENERIC_TEMPLATE % box.typ
template = GENERIC_TEMPLATE
template = template % (box.typ, box.macaddr)
print('no cfg file found for this', box.typ,
f'with id {box.id:06x} (hostname={box.hostname})')
f'with mac address {box.macaddr} (hostname={box.hostname})')
newhostname = input('enter host name: ')
if not newhostname:
print('no hostname given')
return False
cfgfile = BoxInfo.CFGPATH % (newhostname, box.id)
cfgfile = BoxInfo.CFGDIR / f'{newhostname}.cfg'
with open(cfgfile, 'w') as f:
f.write(template)
config = box.read_config()
cfgfile = box.cfgfile
if box.hostname_changed or cfgfile != BoxInfo.CFGPATH % (newhostname, box.id):
if box.hostname_changed or box.hostname != newhostname:
print('changed', box.hostname, newhostname)
box.hostname_changed = True
if cfgfile:
newhostname = basename(cfgfile).rpartition('_')[0]
newhostname = cfgfile.stem.rpartition('_')[0]
if doit:
print('bash sethostname.sh')
unix_cmd('bash', f'{TOOLS}/sethostname.sh')
@ -552,12 +563,10 @@ def handle_config():
try:
netcfg = config['NETWORK']
for name in netcfg:
if name not in box.macaddr:
print(name)
print(box.macaddr)
if name not in box.network_interfaces:
print(f'{name} is not a valid network interface name')
raise RuntimeError('network interface name system does not match')
for ifname in box.macaddr:
for ifname in box.network_interfaces:
content = create_if(ifname, netcfg.get(ifname, 'off'))
# content = '\n'.join('%s=%s' % kv for kv in content.items())
todo = write_when_new(f'/etc/network/interfaces.d/{ifname}', content, as_root=True)
@ -586,7 +595,8 @@ def handle_config():
show.dirty = True
try:
replace_in_file('/etc/default/isc-dhcp-server',
r'INTERFACESv4="(.*)"', ' '.join([n for n in box.macaddr if n != box.main_if]))
r'INTERFACESv4="(.*)"', ' '.join(
[n for n in box.network_interfaces if n != box.main_if]))
except FileNotFoundError:
if 'yes'.startswith(input('install isc-dhcp-server? [y]')):
unix_cmd('apt-get install isc-dhcp-server')

11
sethostname.sh
View File

@ -1,15 +1,12 @@
ETHNAME=$(cat /sys/class/net/eth0/address)
ETHNAME=${ETHNAME//:/}
BOXID=${ETHNAME: -6}
FOUND="$(shopt -s nullglob; echo /home/l_samenv/boxtools/cfg/*_$BOXID.cfg)"
FOUND=($(grep -l -r MAC=$ETHNAME /home/l_samenv/boxtools/cfg))
if [ -z "$FOUND" ]; then
BOXID=${ETHNAME//:/}
BOXID=${BOXID: -6}
HOSTNAME=box$BOXID
else
FOUND=$(basename ${FOUND[0]}) # remove directory part
HOSTNAME=${FOUND%%.*} # remove extension
if [ $HOSTNAME != "box$BOXID" ]; then
HOSTNAME=${HOSTNAME%_*}
fi
HOSTNAME=${FOUND%%.cfg} # remove extension
echo "hostname $HOSTNAME"
fi
echo $HOSTNAME > /etc/hostname

99
utils.py
View File

@ -24,49 +24,102 @@ class UndefinedConfigFile(Exception):
"""config file not found or ambiguous"""
def convert_cfg(file, macaddr=None):
hostname, boxid = file.stem.split('_')
if macaddr is None:
macaddr = f'--:--:--:{boxid[0:2]}:{boxid[2:4]}:{boxid[4:6]}'
box = BoxInfo(macaddr, True)
config = box.read_config()
network = config.get('NETWORK', {})
if len(network) > 2:
mac1 = '00:0d:b9'
if config.get('DISPLAY'):
typ = 'control-box'
else:
typ = 'bare-apu'
elif len(network) == 2:
mac1 = 'd8:3a:dd'
typ = 'dual-eth-rpi'
else:
if config.get('BOX', {}).get('type') == 'ionopi':
mac1 = 'e4:5f:01'
typ = 'ionopi'
else:
mac1 = 'b8:27:eb'
typ = 'ionopimax'
macaddr = macaddr.replace('--:--:--', mac1)
with open(file) as f:
content = f.read()
newfile = file.parent / f'{hostname}.cfg'
with open(newfile, 'w') as f:
f.write(f'[BOX]\ntype={typ}\nMAC={macaddr}\n\n{content}')
if not file.name.endswith('_'):
file.rename(file.parent / (file.name + '_'))
return newfile
def convert_all():
for file in Path('cfg').glob('*_*.cfg*'):
convert_cfg(file)
class BoxInfo:
TOOLS = Path('/home/l_samenv/boxtools')
CFGPATH = str(TOOLS / 'cfg' / '%s_%06x.cfg')
CFGDIR = TOOLS / 'cfg'
BOX_TYPES = {
'00:0d:b9': 'apu', # bare apu or control box
'b8:27:eb': 'cm3', # guess iono pi max
'e4:5f:01': 'ionopi', # guess iono pi
'e4:5f:01': 'ionopi', # guess iono pi
'd8:3a:dd': 'cm4', # guess dual-eth-rpi
}
def __init__(self):
def __init__(self, macaddr=None, relcfg=None):
if relcfg:
self.CFGDIR = Path('cfg')
self.id = None
self.typ = None
self.hostname = socket.gethostname()
self.change_if_names = False
self.cfgfile = None
self.config = None
self.macaddr = {}
self.network_interfaces = {}
self.main_if = None
for ifdev in sorted(glob('/sys/class/net/*/address')):
ifname = ifdev.split('/')[-2]
if ifname == 'lo': # do not consider loopback interface
continue
if ifname.startswith('enp'):
self.change_if_names = True
ifname = f'eth{int(ifname[3]) - 1}'
with open(ifdev) as f:
self.macaddr[ifname] = addr = f.read().strip().lower()
if ifname in ('eth0', 'enp1s0'):
self.id = int(''.join(addr.split(':')[-3:]), 16) & 0xffffff
self.typ = self.BOX_TYPES.get(addr[:8])
self.main_if = ifname
self.oldcfg = False
if macaddr is None:
for ifdev in sorted(glob('/sys/class/net/*/address')):
ifname = ifdev.split('/')[-2]
if ifname == 'lo': # do not consider loopback interface
continue
if ifname.startswith('enp'):
self.change_if_names = True
ifname = f'eth{int(ifname[3]) - 1}'
with open(ifdev) as f:
self.network_interfaces[ifname] = addr = f.read().strip().lower()
if ifname in ('eth0', 'enp1s0'):
print('my mac address', addr)
macaddr = addr
self.main_if = ifname
self.macaddr = macaddr
if macaddr:
self.id = int(''.join(macaddr.split(':')[-3:]), 16) & 0xffffff
self.typ = self.BOX_TYPES.get(macaddr[:8])
self.hwtype = self.typ # this is one of the values in BOX_TYPE and will not change
def get_macaddr(self):
return self.macaddr.get(self.main_if)
def read_config(self, section=None):
cfgfiles = glob(self.CFGPATH % ('*', self.id))
cfgfiles = []
for file in self.CFGDIR.glob('*.cfg'):
with open(file) as f:
for line in f:
if line.startswith(f'MAC={self.macaddr}'):
cfgfiles.append(file)
break
if not cfgfiles:
cfgfiles = list(self.CFGDIR.glob(f'*_{self.id:06x}.cfg*'))
self.oldcfg = True
if len(cfgfiles) > 1:
raise AmbiguousConfigFile('ambiguous cfgfile: %r' % cfgfiles)
if section and not cfgfiles:
raise UndefinedConfigFile('no cfg file found for %s' % self.id)
raise UndefinedConfigFile('no cfg file found for %s' % self.macaddr)
if cfgfiles:
self.cfgfile = cfgfiles[0]
else:
@ -75,7 +128,7 @@ class BoxInfo:
parser.read(self.cfgfile)
if section:
if section in parser.sections():
return dict(parser[section])
return dict(parser[section])
return None
return {k: dict(parser[k]) for k in parser.sections()}