From db2046092fb581ff44ddd8b7b41fbb3e4f6fc498 Mon Sep 17 00:00:00 2001 From: Conrad Lara - KG6JEI Date: Tue, 20 Dec 2016 18:42:42 -0800 Subject: [PATCH] bugfix: Make get_model return model of device instead of board type Fixes the fact that get_model has done the same as other functions. This probably always should of been a real model of active device not just of the hardware type from the begining. DEV NOTE: This is in perl, even though we intended to migrate to LUA the core library that contains this data has yet to be migrated so we need to add this as a perl program. Change-Id: Ib8a4ea6dd881c32e6d7660607576aeb5218b1e7a --- files/usr/local/bin/get_model | 53 +++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/files/usr/local/bin/get_model b/files/usr/local/bin/get_model index 4451ce0d..5ce1a8c0 100755 --- a/files/usr/local/bin/get_model +++ b/files/usr/local/bin/get_model @@ -1,11 +1,46 @@ -#!/bin/sh -#CMLARA: Temporary shell script for ar71xx platform models -# Return the model of the device +#!/usr/bin/perl -w -I/www/cgi-bin +=for commnet -if [ ! -f /tmp/sysinfo/model ]; then - . /lib/functions.sh - . /lib/ar71xx.sh - ar71xx_board_detect -fi + Part of AREDN -- Used for creating Amateur Radio Emergency Data Networks + Copyright (C) 2016 Conrad Lara + See Contributors file for additional contributors -cat /tmp/sysinfo/model + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation version 3 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + + Additional Terms: + + Additional use restrictions exist on the AREDN(TM) trademark and logo. + See AREDNLicense.txt for more info. + + Attributions to the AREDN Project must be retained in the source code. + If importing this code into a new or existing project attribution + to the AREDN project must be added to the source code. + + You must not misrepresent the origin of the material conained within. + + Modified versions must be modified to attribute to the original source + and be marked in reasonable ways as differentiate it from the original + version. + +=cut + +use perlfunc; + +$boardinfo = hardware_info(); + +if ( exists $boardinfo->{'name'} ) { + print ("$boardinfo->{'name'} \n"); +} else { + # This should never happen + print ("Unknown Hardware"); +}