Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Johannes Müller
aports
Commits
84cd971c
Commit
84cd971c
authored
Feb 21, 2011
by
Ariadne Conill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/acf-alpine-baselayout: compatibility with busybox 1.18 in health model
parent
36568de1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
2 deletions
+36
-2
main/acf-alpine-baselayout/APKBUILD
main/acf-alpine-baselayout/APKBUILD
+9
-2
main/acf-alpine-baselayout/busybox-1.18-compat.patch
main/acf-alpine-baselayout/busybox-1.18-compat.patch
+27
-0
No files found.
main/acf-alpine-baselayout/APKBUILD
View file @
84cd971c
...
...
@@ -2,16 +2,23 @@
# Maintainer: Ted Trask <ttrask01@yahoo.com>
pkgname
=
acf-alpine-baselayout
pkgver
=
0.7.3
pkgrel
=
2
pkgrel
=
3
pkgdesc
=
"A web-based system administration interface for alpine-baselayout"
url
=
"http://git.alpinelinux.org/cgit/acf-alpine-baselayout"
arch
=
"noarch"
license
=
"GPL-2"
depends
=
"acf-core lua lua-json4 lua-posix"
source
=
"http://git.alpinelinux.org/cgit/
$pkgname
.git/snapshot/
$pkgname
-
$pkgver
.tar.bz2"
source
=
"http://git.alpinelinux.org/cgit/
$pkgname
.git/snapshot/
$pkgname
-
$pkgver
.tar.bz2
busybox-1.18-compat.patch"
prepare
()
{
cd
"
$srcdir
/
$pkgname
-
$pkgver
"
patch
-p1
<
"
$srcdir
"
/busybox-1.18-compat.patch
}
package
()
{
cd
"
$srcdir
/
$pkgname
-
$pkgver
"
make
DESTDIR
=
"
$pkgdir
"
install
}
md5sums
=
"b462fa1ff228f3552c2eea2d0a4fed96 acf-alpine-baselayout-0.7.3.tar.bz2"
main/acf-alpine-baselayout/busybox-1.18-compat.patch
0 → 100644
View file @
84cd971c
From 96aa7d8650f4de9f1d009e10d45df01d5e7a1331 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Mon, 21 Feb 2011 10:11:48 -0600
Subject: [PATCH] health model: work with procps and busybox 1.18
---
health-model.lua | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/health-model.lua b/health-model.lua
index 2749e2a..bb70073 100644
--- a/health-model.lua
+++ b/health-model.lua
@@ -49,8 +49,8 @@
get_system = function (self)
system.version = cfe({ value=indexver or fs.read_file("/etc/alpine-release") or "Unknown", label="Version" })
system.timezone = cfe({ value=date.what_tz(), label="Time Zone" })
system.uname = cfe({ value=querycmd("uname -a"), label="UName" })
- system.memory = cfe({ value=querycmd("free"), label="Memory usage" })
- system.memory.used = getpercentage(querycmd("free"), "Total:", 3, 4)
+ system.memory = cfe({ value=querycmd("free -o"), label="Memory usage" })
+ system.memory.used = getpercentage(querycmd("free -o"), "Total:", 3, 4)
return cfe({ type="group", value=system })
end
--
1.7.4.1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment