author | andyq <andyq> | 2002-10-10 10:44:36 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-10 10:44:36 (UTC) |
commit | b9729e00576b3466619b1932f410ab39fd719b52 (patch) (unidiff) | |
tree | af909c70def2397d4ff896261df78ef62709ca94 | |
parent | 6e766588ca61322c59d0a527cb240522d9d8210e (diff) | |
download | opie-b9729e00576b3466619b1932f410ab39fd719b52.zip opie-b9729e00576b3466619b1932f410ab39fd719b52.tar.gz opie-b9729e00576b3466619b1932f410ab39fd719b52.tar.bz2 |
Commented out adding default destinations for root, cf and card because
if a CF or SD/MMC card not inserted, ipkg gives a nasty error and sometimes
seg faults
-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 7f724af..b9ce227 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp | |||
@@ -108,12 +108,17 @@ void DataManager :: loadServers() | |||
108 | } | 108 | } |
109 | } | 109 | } |
110 | fclose( fp ); | 110 | fclose( fp ); |
111 | 111 | ||
112 | // Go through the server destination list and add root, cf and card if they | 112 | // Go through the server destination list and add root, cf and card if they |
113 | // don't already exist | 113 | // don't already exist |
114 | /* AQ - commented out as if you don't have a CF or SD card in then | ||
115 | * this causes IPKG to try to create directories on non existant devices | ||
116 | * (which of course fails), gives a nasty error message and can cause ipkg | ||
117 | * to seg fault. | ||
118 | * | ||
114 | vector<Destination>::iterator dit; | 119 | vector<Destination>::iterator dit; |
115 | bool foundRoot = false; | 120 | bool foundRoot = false; |
116 | bool foundCF = false; | 121 | bool foundCF = false; |
117 | bool foundCard = false; | 122 | bool foundCard = false; |
118 | for ( dit = destList.begin() ; dit != destList.end() ; ++dit ) | 123 | for ( dit = destList.begin() ; dit != destList.end() ; ++dit ) |
119 | { | 124 | { |
@@ -134,13 +139,13 @@ void DataManager :: loadServers() | |||
134 | if ( !foundCF ) | 139 | if ( !foundCF ) |
135 | destList.push_back( Destination( "cf", "/mnt/cf" ) ); | 140 | destList.push_back( Destination( "cf", "/mnt/cf" ) ); |
136 | if ( !foundCF ) | 141 | if ( !foundCF ) |
137 | destList.push_back( Destination( "card", "/mnt/card" ) ); | 142 | destList.push_back( Destination( "card", "/mnt/card" ) ); |
138 | #endif | 143 | #endif |
139 | #endif | 144 | #endif |
140 | 145 | */ | |
141 | vector<Server>::iterator it; | 146 | vector<Server>::iterator it; |
142 | for ( it = serverList.begin() ; it != serverList.end() ; ++it ) | 147 | for ( it = serverList.begin() ; it != serverList.end() ; ++it ) |
143 | reloadServerData( it->getServerName() ); | 148 | reloadServerData( it->getServerName() ); |
144 | } | 149 | } |
145 | 150 | ||
146 | void DataManager :: reloadServerData( const char *serverName ) | 151 | void DataManager :: reloadServerData( const char *serverName ) |