Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Liberate
backupninja
Commits
2e9bb3f0
Commit
2e9bb3f0
authored
18 years ago
by
intrigeri
Browse files
Options
Downloads
Patches
Plain Diff
sys: fix the '*' in dpkg --get-selections
parent
26e33dcc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+2
-1
2 additions, 1 deletion
ChangeLog
handlers/sys
+10
-3
10 additions, 3 deletions
handlers/sys
with
12 additions
and
4 deletions
ChangeLog
+
2
−
1
View file @
2e9bb3f0
...
...
@@ -66,7 +66,8 @@ version 0.9.4 -- unreleased
sys:
. Many more system checks were added, (thanks to Petr Klíma)
. Added warning if no devices were found (thanks Ranier Zocholl)
. Enhanced debian package selections to include purged packages (thanks Tom Hoover)
. Enhanced debian package selections to include purged packages (thanks
Tom Hoover)
. Removed warning about vserver not running (thanks anarcat)
ldap:
. Compress now happens in-line to save some disk space (Closes: #370778)
...
...
This diff is collapsed.
Click to expand it.
handlers/sys
+
10
−
3
View file @
2e9bb3f0
...
...
@@ -37,18 +37,19 @@ if [ $os = "debian" ]
then
getconf packagesfile /var/backups/dpkg-selections.txt
getconf packagemgr
`
which dpkg
`
getconf packagemgroptions
"
--get-selections
\*
"
getconf packagemgroptions
'
--get-selections
*'
elif
[
$os
=
"redhat"
]
then
getconf packagesfile /var/backups/rpmpackages.txt
getconf packagemgr
`
which rpm
`
getconf packagemgroptions
"
-qa
"
getconf packagemgroptions
'
-qa
'
getconf SYSREPORT
`
which sysreport
`
getconf sysreport_options
"
-norpm
"
getconf sysreport_options
'
-norpm
'
else
getconf packagesfile /var/backups/unknownOS.txt
fi
packagemgroptions
=
"
${
packagemgroptions
//__star__/*
}
"
getconf partitions
yes
getconf partitionsfile /var/backups/partitions.__star__.txt
...
...
@@ -110,15 +111,21 @@ if [ "$packages" == "yes" ]; then
then
for
vserver
in
`
ls
$VROOTDIR
|
grep
-E
-v
$nodpkg
`
do
# don't expand * since it can be used in $packagemgroptions
set
-o
noglob
debug
"
$VSERVER
$vserver
exec
$packagemgr
$packagemgroptions
>
$VROOTDIR
/
$vserver$packagesfile
"
$VSERVER
$vserver
exec
$packagemgr
$packagemgroptions
>
$VROOTDIR
/
$vserver$packagesfile
||
fatal
"can not save
$packagemgr
info to
$packagesfile
"
set
+o noglog
done
fi
# We want to perform this on the host as well
if
[
"
$packages
"
==
"yes"
]
;
then
# don't expand * since it can be used in $packagemgroptions
set
-o
noglob
debug
"
$packagemgr
$packagemgroptions
>
$packagesfile
"
$packagemgr
$packagemgroptions
>
$packagesfile
||
fatal
"can not save
$packagemgr
info to
$packagesfile
"
set
+o noglob
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment